Improve & refactor codegoalpagesrefactor

82 files changed, 538 insertions, 722 deletions

diff --git a/core/DataArray.php b/core/DataArray.php
index 63433531ee..52b78da325 100644
--- a/core/DataArray.php
+++ b/core/DataArray.php
@@ -182,9 +182,9 @@ class DataArray
     protected static function makeEmptyGoalRow($idGoal)
     {
         if ($idGoal > GoalManager::IDGOAL_ORDER) {
-            return array(Metrics::INDEX_GOAL_NB_CONVERSIONS         => 0,
-                         Metrics::INDEX_GOAL_NB_VISITS_CONVERTED    => 0,
-                         Metrics::INDEX_GOAL_REVENUE                => 0,
+            return array(Metrics::INDEX_GOAL_NB_CONVERSIONS      => 0,
+                         Metrics::INDEX_GOAL_NB_VISITS_CONVERTED => 0,
+                         Metrics::INDEX_GOAL_REVENUE             => 0,
             );
         }
         if ($idGoal == GoalManager::IDGOAL_ORDER) {
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index 1d27bb95e9..07873abdaa 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -164,20 +164,20 @@ class AddColumnsProcessedMetricsGoal extends AddColumnsProcessedMetrics
                 $extraProcessedMetrics[] = new GoalSpecificRevenuePerVisit($idSite, $idGoal); // PerGoal\Revenue
                 $extraProcessedMetrics[] = new Revenue($idSite, $idGoal); // PerGoal\Revenue
 
-                if ($this->processOnlyIdGoal == self::GOALS_PAGES || self::GOALS_PAGES_ECOMMERCE) {
+                if ($this->processOnlyIdGoal == self::GOALS_PAGES || $this->processOnlyIdGoal == self::GOALS_PAGES_ECOMMERCE) {
                     $extraProcessedMetrics[] = new ConversionsAttrib($idSite, $idGoal); // PerGoal\Conversions or GoalSpecific\
                     $extraProcessedMetrics[] = new RevenueAttrib($idSite, $idGoal); // PerGoal\Revenue attrib
                     $extraProcessedMetrics[] = new ConversionPageRate($idSite, $idGoal); // PerGoal\ConversionRate for page uniq views
                 }
 
-                if ($this->processOnlyIdGoal == self::GOALS_ENTRY_PAGES || self::GOALS_ENTRY_PAGES_ECOMMERCE) {
+                if ($this->processOnlyIdGoal == self::GOALS_ENTRY_PAGES || $this->processOnlyIdGoal == self::GOALS_ENTRY_PAGES_ECOMMERCE) {
                     $extraProcessedMetrics[] = new ConversionsEntry($idSite, $idGoal); // PerGoal\Conversions or GoalSpecific\
                     $extraProcessedMetrics[] = new GoalSpecificRevenuePerEntry($idSite, $idGoal); // PerGoal\Revenue entries
                     $extraProcessedMetrics[] = new RevenueEntry($idSite, $idGoal); // PerGoal\Revenue entrances
                     $extraProcessedMetrics[] = new ConversionEntryRate($idSite, $idGoal); // PerGoal\ConversionRate for entrances
                 }
 
-                if ($this->isEcommerce || self::GOALS_PAGES_ECOMMERCE || self::GOALS_ENTRY_PAGES_ECOMMERCE) {
+                if ($this->isEcommerce || $this->processOnlyIdGoal == self::GOALS_PAGES_ECOMMERCE || $this->processOnlyIdGoal == self::GOALS_ENTRY_PAGES_ECOMMERCE) {
                     $extraProcessedMetrics[] = new AverageOrderRevenue($idSite, $idGoal);
                     $extraProcessedMetrics[] = new ItemsCount($idSite, $idGoal);
                 }
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 09949baf19..c51141b322 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -82,18 +82,17 @@ class API extends \Piwik\Plugin\API
      * @param bool|int $idSubtable
      * @param bool|int $depth
      * @param bool|int $flat
-     * @param bool|int $includeGoals
      *
      * @return DataTable|DataTable\Map
      */
     public function getPageUrls($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false,
-                                $depth = false, $flat = false, $includeGoals = false)
+                                $depth = false, $flat = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
         $dataTable = Archive::createDataTableFromArchive('Actions_actions_url', $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable, $depth);
 
-        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_URL, $includeGoals);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_URL);
 
         if ($flat) {
             $dataTable->filter(function(DataTable $dataTable) {
@@ -119,11 +118,11 @@ class API extends \Piwik\Plugin\API
      *
      * @return DataTable|DataTable\Map
      */
-    public function getPageUrlsFollowingSiteSearch($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false, $includeGoals = false)
+    public function getPageUrlsFollowingSiteSearch($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        $dataTable = $this->getPageUrls($idSite, $period, $date, $segment, $expanded, $idSubtable, false, false, $includeGoals);
+        $dataTable = $this->getPageUrls($idSite, $period, $date, $segment, $expanded, $idSubtable);
         $this->keepPagesFollowingSearch($dataTable);
         return $dataTable;
     }
@@ -138,11 +137,11 @@ class API extends \Piwik\Plugin\API
      *
      * @return DataTable|DataTable\Map
      */
-    public function getPageTitlesFollowingSiteSearch($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false, $includeGoals = false)
+    public function getPageTitlesFollowingSiteSearch($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        $dataTable = $this->getPageTitles($idSite, $period, $date, $segment, $expanded, $idSubtable, false, $includeGoals);
+        $dataTable = $this->getPageTitles($idSite, $period, $date, $segment, $expanded, $idSubtable);
         $this->keepPagesFollowingSearch($dataTable);
         return $dataTable;
     }
@@ -166,15 +165,12 @@ class API extends \Piwik\Plugin\API
      * the specified site, period & segment.
      */
     public function getEntryPageUrls($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false,
-                                     $flat = false, $includeGoals = false)
+                                     $flat = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        $dataTable = $this->getPageUrls($idSite, $period, $date, $segment, $expanded, $idSubtable, false, $flat, $includeGoals);
+        $dataTable = $this->getPageUrls($idSite, $period, $date, $segment, $expanded, $idSubtable, false, $flat);
         $this->filterNonEntryActions($dataTable);
-        if ($includeGoals) {
-            $this->filterActionDataTableEntryGoals($dataTable);
-        }
         return $dataTable;
     }
 
@@ -183,33 +179,33 @@ class API extends \Piwik\Plugin\API
      * the specified site, period & segment.
      */
     public function getExitPageUrls($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false,
-                                    $flat = false, $includeGoals = false)
+                                    $flat = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        $dataTable = $this->getPageUrls($idSite, $period, $date, $segment, $expanded, $idSubtable, false, $flat, $includeGoals);
+        $dataTable = $this->getPageUrls($idSite, $period, $date, $segment, $expanded, $idSubtable, false, $flat);
         $this->filterNonExitActions($dataTable);
         return $dataTable;
     }
 
-    public function getPageUrl($pageUrl, $idSite, $period, $date, $segment = false, $includeGoals = false)
+    public function getPageUrl($pageUrl, $idSite, $period, $date, $segment = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
         $callBackParameters = array('Actions_actions_url', $idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable = null);
         $dataTable = $this->getFilterPageDatatableSearch($callBackParameters, $pageUrl, Action::TYPE_PAGE_URL);
         $this->addPageProcessedMetrics($dataTable);
-        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_URL, $includeGoals);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_URL);
         return $dataTable;
     }
 
-    public function getPageTitles($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false, $flat = false, $includeGoals = false)
+    public function getPageTitles($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false, $flat = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
         $dataTable = Archive::createDataTableFromArchive('Actions_actions', $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable);
 
-        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_TITLE, $includeGoals);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_TITLE);
 
         return $dataTable;
     }
@@ -219,15 +215,12 @@ class API extends \Piwik\Plugin\API
      * for the given site, time period & segment.
      */
     public function getEntryPageTitles($idSite, $period, $date, $segment = false, $expanded = false,
-                                       $idSubtable = false, $flat = false, $includeGoals = false)
+                                       $idSubtable = false, $flat = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        $dataTable = $this->getPageTitles($idSite, $period, $date, $segment, $expanded, $idSubtable, $flat, $includeGoals);
+        $dataTable = $this->getPageTitles($idSite, $period, $date, $segment, $expanded, $idSubtable, $flat);
         $this->filterNonEntryActions($dataTable);
-        if ($includeGoals) {
-            $this->filterActionDataTableEntryGoals($dataTable);
-        }
         return $dataTable;
     }
 
@@ -236,23 +229,23 @@ class API extends \Piwik\Plugin\API
      * for the given site, time period & segment.
      */
     public function getExitPageTitles($idSite, $period, $date, $segment = false, $expanded = false,
-                                      $idSubtable = false, $flat = false, $includeGoals = false)
+                                      $idSubtable = false, $flat = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        $dataTable = $this->getPageTitles($idSite, $period, $date, $segment, $expanded, $idSubtable, $flat, $includeGoals);
+        $dataTable = $this->getPageTitles($idSite, $period, $date, $segment, $expanded, $idSubtable, $flat);
         $this->filterNonExitActions($dataTable);
         return $dataTable;
     }
 
-    public function getPageTitle($pageName, $idSite, $period, $date, $segment = false, $includeGoals = false)
+    public function getPageTitle($pageName, $idSite, $period, $date, $segment = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
         $callBackParameters = array('Actions_actions', $idSite, $period, $date, $segment, $expanded = false, $flat = false, $idSubtable = null);
         $dataTable = $this->getFilterPageDatatableSearch($callBackParameters, $pageName, Action::TYPE_PAGE_TITLE);
         $this->addPageProcessedMetrics($dataTable);
-        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_TITLE, $includeGoals);
+        $this->filterActionsDataTable($dataTable, Action::TYPE_PAGE_TITLE);
         return $dataTable;
     }
 
@@ -481,40 +474,18 @@ class API extends \Piwik\Plugin\API
      *
      * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
      * @param bool $isPageTitleType Whether we are handling page title or regular URL
-     * @param bool $includeGoals Whether goals columns should be included in the result
      */
-    private function filterActionsDataTable($dataTable, $isPageTitleType, $includeGoals = false)
+    private function filterActionsDataTable($dataTable, $isPageTitleType)
     {
         // Must be applied before Sort in this case, since the DataTable can contain both int and strings indexes
         // (in the transition period between pre 1.2 and post 1.2 datatable structure)
 
-        if (!$includeGoals) {
-            $dataTable->filter('Piwik\Plugins\Actions\DataTable\Filter\RemoveGoals');
-        } else {
-            $dataTable->queueFilter('Piwik\Plugins\Goals\DataTable\Filter\CalculateConversionPageRate');
-            $dataTable->queueFilter('ReplaceColumnNames');
-            $dataTable->queueFilter('Piwik\Plugins\Goals\DataTable\Filter\RemoveUnusedGoalRevenueColumns');
-            $colsToRemove = ['idaction', 'type', 'nb_conversions', 'revenue', 'nb_visits'];
-            $dataTable->queueFilter('ColumnDelete', array($colsToRemove));
-            $nestedColsToRemove = ['nb_conversions', 'nb_visits_converted', 'nb_conv_pages_before', 'nb_conversions_page_uniq'];
-            $dataTable->queueFilter('ColumnDelete', array($nestedColsToRemove, [], false, true));
-        }
-
+        $dataTable->filter('Piwik\Plugins\Goals\DataTable\Filter\CalculateConversionPageRate');
         $dataTable->filter('Piwik\Plugins\Actions\DataTable\Filter\Actions', array($isPageTitleType));
 
         return $dataTable;
     }
 
-    private function filterActionDataTableEntryGoals($dataTable)
-    {
-        if ($dataTable) {
-            $dataTable->queueFilter('ReplaceColumnNames');
-            $dataTable->queueFilter('Piwik\Plugins\Goals\DataTable\Filter\RemoveUnusedGoalRevenueColumns');
-            $dataTable->queueFilter('ColumnDelete',
-                array($columnsToRemove = ['idaction', 'nb_visits', 'entry_nb_uniq_visitors', 'revenue', 'nb_conversions']));
-        }
-    }
-
     /**
      * Removes DataTable rows referencing actions that were never the first action of a visit.
      *
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index 3dfda4a58b..dc28e02b0e 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -214,7 +214,6 @@ class ArchivingHelper
 
             // Define the possible goal metrics available in the goals data resultset
             if ($isPages) {
-
                 // Page view metrics
                 $possibleMetrics = [
                     PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS             => 'nb_conversions',           // 1
@@ -225,9 +224,7 @@ class ArchivingHelper
                     PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_PAGE_UNIQ   => 'nb_conversions_page_uniq', // 12
                     PiwikMetrics::INDEX_GOAL_REVENUE_ATTRIB             => 'revenue_attrib',           // 15
                 ];
-
             } else {
-
                 // Entry page metrics
                 $possibleMetrics = [
                     PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY              => 'revenue_entry',             // 17
@@ -235,85 +232,82 @@ class ArchivingHelper
                     PiwikMetrics::INDEX_GOAL_REVENUE_PER_ENTRY          => 'revenue_per_entry',         // 13
                     PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY       => 'nb_conversions_entry',      // 16
                 ];
-
             }
 
-            // Find metric columns in the goal query row and add them to the actions data table row
-            foreach ($possibleMetrics as $metricKey => $columnName) {
-
-                if (isset($row['idgoal']) && isset($row[$metricKey])) {
-
-                    // Calculate adjusted revenue and conversions for page view goals
-                    if ($isPages &&
-                        isset($row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ATTRIB]) &&
-                        isset($row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE]))
-                    {
+            unset($row['type']);
+            unset($row['idaction']);
+            $rowsProcessed++;
 
-                        if ($row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE] > 0) {
+            if (!isset($row['idgoal'])) {
+                continue;
+            }
 
-                            $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ATTRIB] = Piwik::getQuotientSafe(
-                                $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS],
-                                $row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE],
-                                GoalManager::REVENUE_PRECISION + 2);
+            // Calculate adjusted revenue and conversions for page view goals
+            if ($isPages &&
+                isset($row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ATTRIB]) &&
+                isset($row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE]))
+            {
 
-                            if (isset($row[PiwikMetrics::INDEX_GOAL_REVENUE])) {
-                                $row[PiwikMetrics::INDEX_GOAL_REVENUE_ATTRIB] = Piwik::getQuotientSafe(
-                                    $row[PiwikMetrics::INDEX_GOAL_REVENUE],
-                                    $row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE],
-                                    GoalManager::REVENUE_PRECISION + 2);
-                            }
-                        }
+                if ($row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE] > 0) {
 
-                        $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_PAGE_RATE] = 0;
+                    $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ATTRIB] = Piwik::getQuotientSafe(
+                        $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS],
+                        $row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE],
+                        GoalManager::REVENUE_PRECISION + 2);
 
+                    if (isset($row[PiwikMetrics::INDEX_GOAL_REVENUE])) {
+                        $row[PiwikMetrics::INDEX_GOAL_REVENUE_ATTRIB] = Piwik::getQuotientSafe(
+                            $row[PiwikMetrics::INDEX_GOAL_REVENUE],
+                            $row[PiwikMetrics::INDEX_GOAL_NB_PAGES_UNIQ_BEFORE],
+                            GoalManager::REVENUE_PRECISION + 2);
                     }
+                }
 
-                    if (!$isPages) {
-
-                        $nbEntrances = $actionRow->getColumn(PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS);
-                        $conversions = $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY];
-                        if ($nbEntrances !== false && is_numeric($nbEntrances) && $nbEntrances > 0) {
-
-                            // Calculate conversion entry rate
-                            if (isset($row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY])) {
-
-                                $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY_RATE] = Piwik::getQuotientSafe(
-                                     $conversions,
-                                     $nbEntrances,
-                                     GoalManager::REVENUE_PRECISION + 1);
-
-                            }
-
-                            // Calculate revenue per entry
-                            if (isset($row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY])) {
-
-                                $row[PiwikMetrics::INDEX_GOAL_REVENUE_PER_ENTRY] = Piwik::getQuotientSafe(
-                                    $row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY],
-                                    $nbEntrances,
-                                    GoalManager::REVENUE_PRECISION + 1);
-
-                            }
-                        }
+                $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_PAGE_RATE] = 0;
+            }
 
+            if (!$isPages) {
+                $nbEntrances = $actionRow->getColumn(PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS);
+                $conversions = $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY];
+                if ($nbEntrances !== false && is_numeric($nbEntrances) && $nbEntrances > 0) {
+
+                    // Calculate conversion entry rate
+                    if (isset($row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY])) {
+                        $row[PiwikMetrics::INDEX_GOAL_NB_CONVERSIONS_ENTRY_RATE] = Piwik::getQuotientSafe(
+                            $conversions,
+                            $nbEntrances,
+                            GoalManager::REVENUE_PRECISION + 1);
                     }
 
+                    // Calculate revenue per entry
                     if (isset($row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY])) {
-                        $row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY] = (float) $row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY];
+                        $row[PiwikMetrics::INDEX_GOAL_REVENUE_PER_ENTRY] = Piwik::getQuotientSafe(
+                            $row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY],
+                            $nbEntrances,
+                            GoalManager::REVENUE_PRECISION + 1);
                     }
+                }
 
-                    // Get goals column
-                    $goalColumnExists = true;
-                    $goalsColumn = $actionRow->getColumn(PiwikMetrics::INDEX_GOALS);
-                    if ($goalsColumn === false) {
-                        $goalColumnExists = false;
-                        $goalsColumn = [];
-                    }
+            }
 
-                    // Create goal subarray if not exists
-                    if (!isset($goalsColumn[$row['idgoal']])) {
-                        $goalsColumn[$row['idgoal']] = [];
-                    }
+            if (isset($row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY])) {
+                $row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY] = (float) $row[PiwikMetrics::INDEX_GOAL_REVENUE_ENTRY];
+            }
+
+            // Get goals column
+            $goalsColumn = $actionRow->getColumn(PiwikMetrics::INDEX_GOALS);
+            if ($goalsColumn === false) {
+                $goalsColumn = [];
+            }
+
+            // Create goal subarray if not exists
+            if (!isset($goalsColumn[$row['idgoal']])) {
+                $goalsColumn[$row['idgoal']] = [];
+            }
 
+            // Find metric columns in the goal query row and add them to the actions data table row
+            foreach ($possibleMetrics as $metricKey => $columnName) {
+                if (isset($row[$metricKey])) {
                     // Add metric
                     if (!isset($goalsColumn[$row['idgoal']][$metricKey])) {
                         $goalsColumn[$row['idgoal']][$metricKey] = $row[$metricKey];
@@ -322,19 +316,9 @@ class ArchivingHelper
                     }
 
                     // Write goals column back to datatable
-                    if ($goalColumnExists) {
-                        $actionRow->setColumn(PiwikMetrics::INDEX_GOALS, $goalsColumn);
-                    } else {
-                        $actionRow->addColumn(PiwikMetrics::INDEX_GOALS, $goalsColumn);
-                    }
-
+                    $actionRow->setColumn(PiwikMetrics::INDEX_GOALS, $goalsColumn);
                 }
             }
-
-            unset($row['type']);
-            unset($row['idaction']);
-            $rowsProcessed++;
-
         }
         return $rowsProcessed;
     }
diff --git a/plugins/Actions/DataTable/Filter/Actions.php b/plugins/Actions/DataTable/Filter/Actions.php
index 61c791c900..fe0130b276 100644
--- a/plugins/Actions/DataTable/Filter/Actions.php
+++ b/plugins/Actions/DataTable/Filter/Actions.php
@@ -116,7 +116,6 @@ class Actions extends BaseFilter
 
                 $row->deleteMetadata('folder_url_start');
                 $row->deleteMetadata('page_title_path');
-                $row->deleteMetadata('goals');
             }
         });
 
diff --git a/plugins/Actions/DataTable/Filter/RemoveGoals.php b/plugins/Actions/DataTable/Filter/RemoveGoals.php
deleted file mode 100644
index e1449cf319..0000000000
--- a/plugins/Actions/DataTable/Filter/RemoveGoals.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Actions\DataTable\Filter;
-
-use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
-use Piwik\API\Request;
-
-class RemoveGoals extends BaseFilter
-{
-    /**
-     * Constructor.
-     *
-     * @param DataTable $table The table to eventually filter.
-     */
-    public function __construct($table)
-    {
-        parent::__construct($table);
-    }
-
-    /**
-     * @param DataTable $table
-     */
-    public function filter($table)
-    {
-        $site = $table->getMetadata('site');
-        if ($site) {
-            $goals = Request::processRequest('Goals.getGoals', ['idSite' => $site->getId(), 'filter_limit' => '-1'], $default = []);
-            if ($goals) {
-                $this->removeGoalsColumns($table, $goals);
-            }
-        }
-    }
-
-    private function removeGoalsColumns(DataTable $datatable, array $goals)
-    {
-        $goalCols = ['nb_conversions', 'revenue', 'nb_conv_pages_before', 'nb_conversions_attrib',
-                         'nb_conversions_page_rate', 'nb_conversions_page_uniq', 'revenue_attrib', 'revenue_entry',
-                         'nb_conversions_entry_rate', 'revenue_per_entry', 'nb_conversions_entry'];
-
-        foreach ($datatable->getRowsWithoutSummaryRow() as $row) {
-
-            foreach ($goals as $goalId => $goal) {
-                foreach ($goalCols as $columnName) {
-                    $row->deleteColumn('goal_'.$goalId.'_'.$columnName);
-                }
-            }
-            $row->deleteMetadata('goals');
-
-            $st = $row->getSubtable();
-            if ($st) {
-                $this->removeGoalsColumns($st, $goals);
-            }
-
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js
index 1ca1cbdf3b..2c95333d29 100644
--- a/plugins/CoreHome/javascripts/dataTable_rowactions.js
+++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js
@@ -326,7 +326,7 @@ DataTable_RowActions_RowEvolution.prototype.performAction = function (label, tr,
         }
     });
 
-    if (this.dataTable && (this.dataTable.jsViewDataTable === 'tableGoals')) {
+    if (this.dataTable && this.dataTable.jsViewDataTable === 'tableGoals') {
         // When there is a idGoal parameter available, the user is currently viewing a Goal or Ecommerce page
         // In this case we want to show the specific goal metrics in the row evolution
         if (extraParams['idGoal']) {
diff --git a/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionEntryRate.php b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionEntryRate.php
index 4bfefd94bb..0d2d3ee347 100644
--- a/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionEntryRate.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionEntryRate.php
@@ -30,7 +30,7 @@ class ConversionEntryRate extends GoalSpecificProcessedMetric
 
     public function getTranslatedName()
     {
-        return Piwik::translate('Goals_ColumnConversionEntryRate', $this->getGoalName());
+        return Piwik::translate('Goals_ConversionRate', $this->getGoalName());
     }
 
     public function getDocumentation()
diff --git a/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionPageRate.php b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionPageRate.php
index 033fc63152..2eda5dc414 100644
--- a/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionPageRate.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionPageRate.php
@@ -8,6 +8,7 @@
 namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable\Row;
+use Piwik\Metrics;
 use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
@@ -40,7 +41,7 @@ class ConversionPageRate extends GoalSpecificProcessedMetric
 
     public function getDependentMetrics()
     {
-        return [];
+        return ['goals'];
     }
 
     public function format($value, Formatter $formatter)
@@ -50,6 +51,9 @@ class ConversionPageRate extends GoalSpecificProcessedMetric
 
     public function compute(Row $row)
     {
-        $this->getMetric($row, 'nb_conversions_page_rate');
+        $mappingFromNameToIdGoal = Metrics::getMappingFromNameToIdGoal();
+        $goalMetrics = $this->getGoalMetrics($row);
+
+        return $this->getMetric($goalMetrics, 'nb_conversions_page_rate', $mappingFromNameToIdGoal);
     }
 }
\ No newline at end of file
diff --git a/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionsEntry.php b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionsEntry.php
index 77c8469e89..3fe5a84f27 100644
--- a/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionsEntry.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionsEntry.php
@@ -26,7 +26,7 @@ class ConversionsEntry extends GoalSpecificProcessedMetric
 
     public function getTranslatedName()
     {
-        return Piwik::translate('Goals_ColumnConversionsEntry', $this->getGoalNameForDocs());
+        return Piwik::translate('Goals_Conversions', $this->getGoalNameForDocs());
     }
 
     public function getDocumentation()
diff --git a/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueAttrib.php b/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueAttrib.php
index bd3b187d93..fc168bdda8 100644
--- a/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueAttrib.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueAttrib.php
@@ -28,7 +28,7 @@ class RevenueAttrib extends GoalSpecificProcessedMetric
 
     public function getTranslatedName()
     {
-        return Piwik::translate('%s ' . Piwik::translate('Goals_ColumnRevenueAttributed'), $this->getGoalName());
+        return Piwik::translate(Piwik::translate('Goals_NRevenue'), $this->getGoalName());
     }
 
     public function getDocumentation()
diff --git a/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueEntry.php b/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueEntry.php
index 207797261a..5461719ebf 100644
--- a/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueEntry.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/RevenueEntry.php
@@ -28,7 +28,7 @@ class RevenueEntry extends GoalSpecificProcessedMetric
 
     public function getTranslatedName()
     {
-        return Piwik::translate('%s ' . Piwik::translate('Goals_ColumnRevenueAttributed'), $this->getGoalName());
+        return Piwik::translate(Piwik::translate('Goals_NRevenue'), $this->getGoalName());
     }
 
     public function getDocumentation()
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 96443ea348..ffcbfc0952 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -327,8 +327,7 @@ class Controller extends \Piwik\Plugin\Controller
                                    &filter_sort_order=desc
                                    &filter_sort_column=$columnNbConversions" .
                 // select a couple more in case some are not valid (ie. conversions==0 or they are "Keyword not defined")
-                "&filter_limit=" . (self::COUNT_TOP_ROWS_TO_DISPLAY + 2).
-                ($dimensionName == 'entry_page' ? '&$includeGoals=1' : ''));
+                "&filter_limit=" . (self::COUNT_TOP_ROWS_TO_DISPLAY + 2));
             $datatable = $request->process();
             $topDimension = array();
             $count = 0;
diff --git a/plugins/Goals/DataTable/Filter/CalculateConversionPageRate.php b/plugins/Goals/DataTable/Filter/CalculateConversionPageRate.php
index 30d9283b2f..cbae2e6bdd 100644
--- a/plugins/Goals/DataTable/Filter/CalculateConversionPageRate.php
+++ b/plugins/Goals/DataTable/Filter/CalculateConversionPageRate.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Goals\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
+use Piwik\Metrics;
 use Piwik\Piwik;
 
 class CalculateConversionPageRate extends BaseFilter
@@ -29,47 +30,37 @@ class CalculateConversionPageRate extends BaseFilter
      */
     public function filter($table)
     {
-
         $goalTotals = [];
 
         // Find all conversions for each goal in the table and store in an array
         foreach ($table->getRowsWithoutSummaryRow() as $row) {
-            if (isset($row['goals'])) {
-                foreach ($row['goals'] as $goalIdString => $metrics) {
-                    if (isset($row['goals'][$goalIdString]['nb_conversions_attrib'])) {
-                        if (isset($goalTotals[$goalIdString])) {
-                            $goalTotals[$goalIdString] += $row['goals'][$goalIdString]['nb_conversions_attrib'];
-                        } else {
-                            $goalTotals[$goalIdString] = $row['goals'][$goalIdString]['nb_conversions_attrib'];
+            if (isset($row[Metrics::INDEX_GOALS])) {
+                foreach ($row[Metrics::INDEX_GOALS] as $goalIdString => $metrics) {
+                    if (isset($row[Metrics::INDEX_GOALS][$goalIdString][Metrics::INDEX_GOAL_NB_CONVERSIONS_ATTRIB])) {
+                        if (!isset($goalTotals[$goalIdString])) {
+                            $goalTotals[$goalIdString] = 0;
                         }
+                        $goalTotals[$goalIdString] += $row[Metrics::INDEX_GOALS][$goalIdString][Metrics::INDEX_GOAL_NB_CONVERSIONS_ATTRIB];
                     }
                 }
             }
         }
 
         // Walk the rows and populate the nb_conversions_page_rate with nb_conversions_page_uniq / $goalTotals[goal id]
-        foreach ($table->getRowsWithoutSummaryRow() as $row) {
-            if (isset($row['goals'])) {
-                foreach ($row['goals'] as $goalIdString => $metrics) {
-                    $goalId = substr($goalIdString,7);
-                    if (isset($row['goals'][$goalIdString]['nb_conversions_page_uniq'])) {
+        foreach ($table->getRowsWithoutSummaryRow() as &$row) {
+            if (isset($row[Metrics::INDEX_GOALS])) {
+                foreach ($row[Metrics::INDEX_GOALS] as $goalIdString => $metrics) {
+                    if (isset($row[Metrics::INDEX_GOALS][$goalIdString][Metrics::INDEX_GOAL_NB_CONVERSIONS_PAGE_UNIQ])) {
 
                         $rate = Piwik::getQuotientSafe(
-                                $row['goals'][$goalIdString]['nb_conversions_page_uniq'],
+                                $row[Metrics::INDEX_GOALS][$goalIdString][Metrics::INDEX_GOAL_NB_CONVERSIONS_PAGE_UNIQ],
                                 $goalTotals[$goalIdString],
                                 3
                             );
-                        $row['goals'][$goalIdString]['nb_conversions_page_rate'] = $rate;
-
-                        // This filter runs after the goal values have been copied from numeric named columns in the subtable
-                        // to labelled columns on the row, so we need to update the goal_x_nb_conversions_page_rate column too
-                        $row['goal_'.$goalId.'_nb_conversions_page_rate'] = $rate;
-
+                        $row[Metrics::INDEX_GOALS][$goalIdString][Metrics::INDEX_GOAL_NB_CONVERSIONS_PAGE_RATE] = $rate;
                     }
                 }
             }
         }
-
     }
-
 }
diff --git a/plugins/Goals/DataTable/Filter/RemoveUnusedGoalRevenueColumns.php b/plugins/Goals/DataTable/Filter/RemoveUnusedGoalRevenueColumns.php
index 574b9a99ec..d54be6c870 100644
--- a/plugins/Goals/DataTable/Filter/RemoveUnusedGoalRevenueColumns.php
+++ b/plugins/Goals/DataTable/Filter/RemoveUnusedGoalRevenueColumns.php
@@ -13,7 +13,6 @@ use Piwik\DataTable;
 
 class RemoveUnusedGoalRevenueColumns extends BaseFilter
 {
-
     /**
      * @param DataTable $table
      */
@@ -43,34 +42,20 @@ class RemoveUnusedGoalRevenueColumns extends BaseFilter
 
         // Check if there are any values in each column
         foreach ($table->getRowsWithoutSummaryRow() as $row) {
-
-            $didChecks = false;
             foreach ($columnsToCheck as $colName => $shouldRemove) {
-                if ($shouldRemove) {
-                    $didChecks = true;
-                }
                 if (isset($row[$colName]) && $row[$colName] > 0) {
                     $columnsToCheck[$colName] = false;
                 }
             }
-            if (!$didChecks) {
-                break 1;
-            }
-
         }
 
-        $columnsToRemove = [];
-        foreach ($columnsToCheck as $c => $shouldRemove) {
-            if ($shouldRemove) {
-                $columnsToRemove[] = $c;
-            }
-        }
+        $columnsToCheck = array_filter($columnsToCheck);
 
-        // We can't remove the columns from here, it needs to be done in the visualisation, so set a metadata value
-        // on the datatable to indicate the columns to be removed, the visualisation can then check for this and
-        // adjust the view config
-        $table->setMetadata('excluded_goal_columns', json_encode($columnsToRemove, true));
+        if (empty($columnsToCheck)) {
+            return;
+        }
 
+        $table->deleteColumns(array_keys($columnsToCheck));
     }
 
     /**
@@ -84,13 +69,13 @@ class RemoveUnusedGoalRevenueColumns extends BaseFilter
     {
         $result = array();
         foreach ($table->getRows() as $row) {
-            $goals = $row->getMetadata('goals');
+            $goals = $row->getColumn('goals');
             if (!$goals) {
                 continue;
             }
 
-            foreach ($goals as $goalId) {
-                $result[] = $goalId;
+            foreach ($goals as $goalIdString => $metrics) {
+                $result[] = substr($goalIdString, 7);
             }
         }
         return array_unique($result);
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 8703e6c260..ead6eb6d56 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -256,40 +256,22 @@ class Goals extends \Piwik\Plugin
             'revenue'         => Piwik::translate('General_ColumnRevenue')
         );
 
-        // Entry type goals, not per visit
-        $goalEntryProcessedMetrics = array(
-            'revenue_per_entry' => Piwik::translate('General_ColumnValuePerEntry'),
-        );
-
-        $goalEntryMetrics = array(
-            'nb_conversions'  => Piwik::translate('Goals_ColumnConversions'),
-            'nb_conversions_entry_rate' => Piwik::translate('General_ColumnConversionRate'),
-            'revenue'         => Piwik::translate('General_ColumnRevenue')
-        );
-
         $reportsWithGoals = self::getAllReportsWithGoalMetrics();
 
-        $includeGoals = Common::getRequestVar('includeGoals', false);
-
         foreach ($reportsWithGoals as $reportWithGoals) {
             // Select this report from the API metadata array
             // and add the Goal metrics to it
             foreach ($reports as &$apiReportToUpdate) {
+                // We do not add anything for Action reports, as no overall metrics are processed there at the moment
+                if ($apiReportToUpdate['module'] === 'Actions') {
+                    continue;
+                }
+
                 if ($apiReportToUpdate['module'] == $reportWithGoals['module']
                     && $apiReportToUpdate['action'] == $reportWithGoals['action']
                     && empty($apiReportToUpdate['parameters'])) {
-
-                    if (!$includeGoals && $reportWithGoals['module'] == 'Actions') {
-                        continue;
-                    }
-
-                    if ($reportWithGoals['action'] == 'getEntryPageUrls') {
-                        $apiReportToUpdate['metricsGoal'] = $goalEntryMetrics;
-                        $apiReportToUpdate['processedMetricsGoal'] = $goalEntryProcessedMetrics;
-                    } else {
-                        $apiReportToUpdate['metricsGoal'] = $goalMetrics;
-                        $apiReportToUpdate['processedMetricsGoal'] = $goalProcessedMetrics;
-                    }
+                    $apiReportToUpdate['metricsGoal'] = $goalMetrics;
+                    $apiReportToUpdate['processedMetricsGoal'] = $goalProcessedMetrics;
                     break;
                 }
             }
diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php
index 364dace4c0..6e50d5a4c5 100644
--- a/plugins/Goals/Visualizations/Goals.php
+++ b/plugins/Goals/Visualizations/Goals.php
@@ -34,14 +34,15 @@ class Goals extends HtmlTable
 
     public function beforeLoadDataTable()
     {
+        $request = $this->getRequestArray();
+        $idGoal = $request['idGoal'] ?? null;
+
         // Check if one of the pages display types should be used
         $requestMethod = $this->requestConfig->getApiModuleToRequest().'.'.$this->requestConfig->getApiMethodToRequest();
         if (in_array($requestMethod, ['Actions.getPageUrls', 'Actions.getPageTitles'])) {
             $this->displayType = self::GOALS_DISPLAY_PAGES;
-            $this->requestConfig->request_parameters_to_modify['includeGoals'] = true;
-            if (isset($_REQUEST['idGoal']) &&
-                ($_REQUEST['idGoal'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER || $_REQUEST['idGoal'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART))
-            {
+            $this->config->filters[] = ['Piwik\Plugins\Goals\DataTable\Filter\RemoveUnusedGoalRevenueColumns'];
+            if ($idGoal === Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER || $idGoal === Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
                 $this->requestConfig->request_parameters_to_modify['idGoal'] = AddColumnsProcessedMetricsGoal::GOALS_ENTRY_PAGES_ECOMMERCE;
             } else {
                 $this->requestConfig->request_parameters_to_modify['idGoal'] = AddColumnsProcessedMetricsGoal::GOALS_PAGES;
@@ -49,9 +50,8 @@ class Goals extends HtmlTable
 
         } else if (in_array($requestMethod, ['Actions.getEntryPageUrls', 'Actions.getEntryPageTitles'])) {
             $this->displayType = self::GOALS_DISPLAY_ENTRY_PAGES;
-            $this->requestConfig->request_parameters_to_modify['includeGoals'] = true;
-            if (isset($_REQUEST['idGoal']) &&
-                ($_REQUEST['idGoal'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER || $_REQUEST['idGoal'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART)) {
+            $this->config->filters[] = ['Piwik\Plugins\Goals\DataTable\Filter\RemoveUnusedGoalRevenueColumns'];
+            if ($idGoal === Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER || $idGoal === Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
                 $this->requestConfig->request_parameters_to_modify['idGoal'] = AddColumnsProcessedMetricsGoal::GOALS_ENTRY_PAGES_ECOMMERCE;
             } else {
                 $this->requestConfig->request_parameters_to_modify['idGoal'] = AddColumnsProcessedMetricsGoal::GOALS_ENTRY_PAGES;
@@ -89,13 +89,11 @@ class Goals extends HtmlTable
         }
 
         if ($this->displayType == self::GOALS_DISPLAY_PAGES) {
-            $this->removeExcludedColumns();
             $this->config->addTranslation('nb_hits', Piwik::translate('General_ColumnUniquePageviews'));
             $this->config->metrics_documentation['nb_hits'] = Piwik::translate('General_ColumnUniquePageviewsDocumentation');
         }
 
         if ($this->displayType == self::GOALS_DISPLAY_ENTRY_PAGES) {
-            $this->removeExcludedColumns();
             $this->config->metrics_documentation['entry_nb_visits'] = Piwik::translate('General_ColumnEntrancesDocumentation');
         }
 
@@ -334,25 +332,4 @@ class Goals extends HtmlTable
             return $data['idgoal'];
         }, $allGoals);
     }
-
-    /**
-     * Hide any goal columns marked as excluded by datatable filters
-     */
-    protected function removeExcludedColumns()
-    {
-        $excludedGoalColumns = $this->dataTable->getMetadata('excluded_goal_columns');
-        if ($excludedGoalColumns) {
-            $excludedGoalColumns = json_decode($excludedGoalColumns);
-            foreach ($this->config->columns_to_display as $k => $v) {
-                foreach ($excludedGoalColumns as $excludeColName) {
-                    if ($v === $excludeColName) {
-                        unset($this->config->columns_to_display[$k]);
-                        break;
-                    }
-                }
-            }
-            $this->dataTable->deleteMetadata('excluded_goal_columns');
-        }
-    }
-
 }
diff --git a/plugins/Goals/lang/en.json b/plugins/Goals/lang/en.json
index 36b81f0b56..16abfcc500 100644
--- a/plugins/Goals/lang/en.json
+++ b/plugins/Goals/lang/en.json
@@ -140,13 +140,9 @@
         "GoalsOverviewSubcategoryHelp2": "Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.",
         "ManageGoalsSubcategoryHelp1": "This section allows you to create and edit Goals for specific actions which visitors take on your site, such as visiting a certain page or submitting a specific form. Goal reports vary but can help you track your website performance against business objectives such as lead generation, online sales and increased brand exposure.",
         "ManageGoalsSubcategoryHelp2": "Learn more in our Goals guide here.",
-        "ColumnRevenueAttributed": "Revenue",
         "ColumnRevenueAttributedDocumentation": "The share of all revenue for %s where this page was viewed before conversion.",
-        "ColumnConversionsEntry": "Conversions",
         "ColumnConversionsEntryDocumentation": "The total number of goal conversions where this page was the entry page.",
-        "ColumnConversionEntryRate": "%s Conversion Rate ",
         "ColumnConversionEntryRateDocumentation": "The percent of entrances that were converted for %s.",
-        "ColumnRevenueEntry": "Revenue",
         "ColumnRevenueEntryDocumentation": "The share of all revenue for %s where this page was the entry pag.e"
     }
 }
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/TrackGoalsPagesTest.php b/plugins/Goals/tests/System/TrackGoalsPagesTest.php
index 4433743375..efcad2dd16 100644
--- a/plugins/Goals/tests/System/TrackGoalsPagesTest.php
+++ b/plugins/Goals/tests/System/TrackGoalsPagesTest.php
@@ -34,14 +34,14 @@ class TrackGoalsPagesTest extends SystemTestCase
     {
         return [
             ['Actions.getPageUrls',        ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime,
-                                            'idGoal' => 1, 'includeGoals' => 1]],
+                                            'idGoal' => 1]],
             ['Actions.getPageTitles',      ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime,
-                                            'idGoal' => 1, 'includeGoals' => 1]],
+                                            'idGoal' => 1]],
             ['Actions.getEntryPageUrls',   ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime,
-                                            'idGoal' => 1, 'includeGoals' => 1, 'otherRequestParameters' =>
+                                            'idGoal' => 1, 'otherRequestParameters' =>
                                                               ['filter_update_columns_when_show_all_goals' => 1]]],
             ['Actions.getEntryPageTitles', ['idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime,
-                                            'idGoal' => 1, 'includeGoals' => 1, 'otherRequestParameters' =>
+                                            'idGoal' => 1, 'otherRequestParameters' =>
                                                               ['filter_update_columns_when_show_all_goals' => 1]]]
         ];
     }
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml
index 37c54238f6..99c58a0678 100644
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml
@@ -21,7 +21,7 @@
 				<revenue>30</revenue>
 				<nb_conv_pages_before>6</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml
index 9114308c5e..9985c379c0 100644
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml
@@ -21,7 +21,7 @@
 				<revenue>30</revenue>
 				<nb_conv_pages_before>6</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml
index 96ad1c2c85..620f230934 100644
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml
@@ -21,7 +21,7 @@
 				<revenue>30</revenue>
 				<nb_conv_pages_before>6</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -55,7 +55,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>6</nb_conv_pages_before>
 				<nb_conversions_attrib>0.75</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>7.5</revenue_attrib>
 			</row>
@@ -83,7 +83,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>0.25</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>2.5</revenue_attrib>
 			</row>
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml
index 76810041d6..cc292b3d33 100644
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml
@@ -21,7 +21,7 @@
 				<revenue>30</revenue>
 				<nb_conv_pages_before>6</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -56,7 +56,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>6</nb_conv_pages_before>
 				<nb_conversions_attrib>0.75</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>7.5</revenue_attrib>
 			</row>
@@ -85,7 +85,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>0.25</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>2.5</revenue_attrib>
 			</row>
diff --git a/plugins/Goals/tests/UI/Goals_spec.js b/plugins/Goals/tests/UI/Goals_spec.js
index 6b25a29237..4e8cd65e4e 100644
--- a/plugins/Goals/tests/UI/Goals_spec.js
+++ b/plugins/Goals/tests/UI/Goals_spec.js
@@ -25,8 +25,8 @@ describe("Goals", function () {
         await page.evaluate(function(){
             $('div.dimensionCategory:nth-child(2) > ul:nth-child(1) > li:nth-child(1)').click();
         });
-
-        await page.waitForSelector('.dimensionReport');
+        await page.waitForTimeout(100);
+        await page.waitForSelector('.dimensionReport .dataTableVizGoals');
         await page.waitForNetworkIdle();
 
         var report = await page.$('.dimensionReport');
@@ -36,10 +36,10 @@ describe("Goals", function () {
     it('should show goals by page titles', async function() {
 
         await page.evaluate(function(){
-            $('div.dimensionCategory:nth-child(2) > ul:nth-child(1) > li:nth-child(3)').click();
+            $('div.dimensionCategory:nth-child(2) > ul:nth-child(1) > li:nth-child(4)').click();
         });
-
-        await page.waitForSelector('.dimensionReport');
+        await page.waitForTimeout(100);
+        await page.waitForSelector('.dimensionReport .dataTableVizGoals');
         await page.waitForNetworkIdle();
 
         var report = await page.$('.dimensionReport');
@@ -51,8 +51,8 @@ describe("Goals", function () {
         await page.evaluate(function(){
             $('div.dimensionCategory:nth-child(2) > ul:nth-child(1) > li:nth-child(2)').click();
         });
-
-        await page.waitForSelector('.dimensionReport');
+        await page.waitForTimeout(100);
+        await page.waitForSelector('.dimensionReport .dataTableVizGoals');
         await page.waitForNetworkIdle();
 
         var report = await page.$('.dimensionReport');
@@ -62,10 +62,10 @@ describe("Goals", function () {
     it('should show goals by entry page titles', async function() {
 
         await page.evaluate(function(){
-            $('.div.dimensionCategory:nth-child(2) > ul:nth-child(1) > li:nth-child(4)').click();
+            $('div.dimensionCategory:nth-child(2) > ul:nth-child(1) > li:nth-child(3)').click();
         });
-
-        await page.waitForSelector('.dimensionReport');
+        await page.waitForTimeout(100);
+        await page.waitForSelector('.dimensionReport .dataTableVizGoals');
         await page.waitForNetworkIdle();
 
         var report = await page.$('.dimensionReport');
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_page_titles.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_page_titles.png
index 1ccef5577b..f6e6d9fb33 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_page_titles.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_page_titles.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8e7d04500456adb8538bca116f77f33d86c44cbd6aad88ab41a2c6608e915b6
-size 21695
+oid sha256:c7b99c320af391f1d9fbf0e4c9255421e3445ab5ebb06d60c101b38b7e6cd387
+size 26284
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_pages.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_pages.png
index 1ccef5577b..24b10fa868 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_pages.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_entry_pages.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8e7d04500456adb8538bca116f77f33d86c44cbd6aad88ab41a2c6608e915b6
-size 21695
+oid sha256:a86d838d77362c5fade9b8ef7e6c961327638a27cc767ef82c686b9fa43b5fe1
+size 24450
diff --git a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png
index e32d942891..6678e8f7df 100644
--- a/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png
+++ b/plugins/Goals/tests/UI/expected-screenshots/Goals_goals_by_page_titles.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ba0e6f332704e60342c2a46654d74dab9f1817452bbe1194aa5c71e62dcb205
-size 23348
+oid sha256:a34f6250f65e3a1a10d3b5999f94f14522e21c6462acc89c3f09e88dca5b8374
+size 31703
diff --git a/tests/PHPUnit/Framework/TestRequest/ApiTestConfig.php b/tests/PHPUnit/Framework/TestRequest/ApiTestConfig.php
index 7c95279f6e..9e1d50efdc 100644
--- a/tests/PHPUnit/Framework/TestRequest/ApiTestConfig.php
+++ b/tests/PHPUnit/Framework/TestRequest/ApiTestConfig.php
@@ -93,13 +93,6 @@ class ApiTestConfig
     public $idGoal = false;
 
     /**
-     * The value to use for the idGoal query parameter.
-     *
-     * @var int|bool
-     */
-    public $includeGoals = false;
-
-    /**
      * The value to use for the apiModule query parameter.
      *
      * @var string|false
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
index 4ed9ce64bb..80b6f191b5 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
@@ -88,7 +88,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -101,7 +101,7 @@
 				<revenue>31</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>10.3333</revenue_attrib>
 				<revenue_entry>31</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
index 94315f5b32..1bb9c195d4 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
@@ -86,7 +86,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -99,7 +99,7 @@
 				<revenue>31</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>10.3333</revenue_attrib>
 				<revenue_entry>31</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
index 4ed9ce64bb..80b6f191b5 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
@@ -88,7 +88,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -101,7 +101,7 @@
 				<revenue>31</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>10.3333</revenue_attrib>
 				<revenue_entry>31</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Actions.getPageUrls_day.xml
index 4ed9ce64bb..80b6f191b5 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventValueMatch__Actions.getPageUrls_day.xml
@@ -88,7 +88,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -101,7 +101,7 @@
 				<revenue>31</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>10.3333</revenue_attrib>
 				<revenue_entry>31</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
index 4ed9ce64bb..80b6f191b5 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
@@ -88,7 +88,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -101,7 +101,7 @@
 				<revenue>31</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>10.3333</revenue_attrib>
 				<revenue_entry>31</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml
index 6430132989..4392d70832 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml
@@ -284,7 +284,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.063</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -3239,7 +3239,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3757,7 +3757,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4277,7 +4277,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5006,7 +5006,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml
index 263eff271a..8dc22648bc 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.344</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -1123,7 +1123,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -2180,7 +2180,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -3144,7 +3144,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.063</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -3520,7 +3520,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3895,7 +3895,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4249,7 +4249,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4927,7 +4927,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5303,7 +5303,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5775,7 +5775,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -6184,7 +6184,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -6614,7 +6614,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -7087,7 +7087,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -8000,7 +8000,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -8409,7 +8409,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml
index 218d56e2bd..c4167714bf 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_labelFilter__Actions.getPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.344</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -155,7 +155,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__Actions.getPageUrls_day.xml
index fc067cbb3a..0cabe44585 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleAgainstLongMultiple__Actions.getPageUrls_day.xml
@@ -168,7 +168,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -380,7 +380,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml
index f884118a5b..77eabe2d01 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleMultiPeriods__Actions.getPageUrls_day.xml
@@ -21,7 +21,7 @@
 					<revenue>20</revenue>
 					<nb_conv_pages_before>4</nb_conv_pages_before>
 					<nb_conversions_attrib>4</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.364</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 					<revenue_attrib>20</revenue_attrib>
 					<revenue_entry>20</revenue_entry>
@@ -924,7 +924,7 @@
 					<revenue>15</revenue>
 					<nb_conv_pages_before>3</nb_conv_pages_before>
 					<nb_conversions_attrib>3</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.273</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 					<revenue_attrib>15</revenue_attrib>
 					<revenue_entry>15</revenue_entry>
@@ -2026,7 +2026,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.091</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -2575,7 +2575,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.091</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -3230,7 +3230,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.091</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -3805,7 +3805,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.091</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -4382,7 +4382,7 @@
 					<revenue>15</revenue>
 					<nb_conv_pages_before>3</nb_conv_pages_before>
 					<nb_conversions_attrib>3</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.375</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 					<revenue_attrib>15</revenue_attrib>
 					<revenue_entry>15</revenue_entry>
@@ -5445,7 +5445,7 @@
 					<revenue>10</revenue>
 					<nb_conv_pages_before>2</nb_conv_pages_before>
 					<nb_conversions_attrib>2</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.25</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 					<revenue_attrib>10</revenue_attrib>
 					<revenue_entry>10</revenue_entry>
@@ -6334,7 +6334,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -7079,7 +7079,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -7654,7 +7654,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -8279,7 +8279,7 @@
 					<revenue>15</revenue>
 					<nb_conv_pages_before>3</nb_conv_pages_before>
 					<nb_conversions_attrib>3</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.333</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 					<revenue_attrib>15</revenue_attrib>
 					<revenue_entry>15</revenue_entry>
@@ -9017,7 +9017,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.111</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -9567,7 +9567,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.111</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -10504,7 +10504,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.111</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -11053,7 +11053,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.111</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -11708,7 +11708,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.111</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -12283,7 +12283,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.111</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -13899,7 +13899,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -14451,7 +14451,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml
index d6942a25bc..d7805bf63f 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml
@@ -24,7 +24,7 @@
 					<revenue>55</revenue>
 					<nb_conv_pages_before>11</nb_conv_pages_before>
 					<nb_conversions_attrib>11</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.344</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 					<revenue_attrib>55</revenue_attrib>
 					<revenue_entry>55</revenue_entry>
@@ -1441,7 +1441,7 @@
 					<revenue>20</revenue>
 					<nb_conv_pages_before>4</nb_conv_pages_before>
 					<nb_conversions_attrib>4</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 					<revenue_attrib>20</revenue_attrib>
 					<revenue_entry>20</revenue_entry>
@@ -2706,7 +2706,7 @@
 					<revenue>20</revenue>
 					<nb_conv_pages_before>4</nb_conv_pages_before>
 					<nb_conversions_attrib>4</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 					<revenue_attrib>20</revenue_attrib>
 					<revenue_entry>20</revenue_entry>
@@ -3872,7 +3872,7 @@
 					<revenue>10</revenue>
 					<nb_conv_pages_before>2</nb_conv_pages_before>
 					<nb_conversions_attrib>2</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.063</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 					<revenue_attrib>10</revenue_attrib>
 					<revenue_entry>10</revenue_entry>
@@ -4489,7 +4489,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -5087,7 +5087,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -5662,7 +5662,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -6764,7 +6764,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -7381,7 +7381,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -8065,7 +8065,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -8686,7 +8686,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -9322,7 +9322,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -9997,7 +9997,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -11122,7 +11122,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
@@ -11743,7 +11743,7 @@
 					<revenue>5</revenue>
 					<nb_conv_pages_before>1</nb_conv_pages_before>
 					<nb_conversions_attrib>1</nb_conversions_attrib>
-					<nb_conversions_page_rate>0</nb_conversions_page_rate>
+					<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 					<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 					<revenue_attrib>5</revenue_attrib>
 					<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml
index e631b36d85..c987845ac9 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.344</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -1100,7 +1100,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -1736,7 +1736,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -2366,7 +2366,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.063</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2602,7 +2602,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2828,7 +2828,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3049,7 +3049,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3457,7 +3457,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3693,7 +3693,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4037,7 +4037,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4318,7 +4318,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4614,7 +4614,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4910,7 +4910,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5695,7 +5695,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5976,7 +5976,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml
index 9ae46b5d16..17318f7761 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_rangePeriodAgainstSingle__Actions.getPageUrls_range.xml
@@ -20,7 +20,7 @@
 				<revenue>50</revenue>
 				<nb_conv_pages_before>10</nb_conv_pages_before>
 				<nb_conversions_attrib>10</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.333</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>10</nb_conversions_page_uniq>
 				<revenue_attrib>50</revenue_attrib>
 				<revenue_entry>50</revenue_entry>
@@ -1347,7 +1347,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.133</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -2532,7 +2532,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.133</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -3619,7 +3619,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.067</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -4171,7 +4171,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4722,7 +4722,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5231,7 +5231,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -6210,7 +6210,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -6762,7 +6762,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -7372,7 +7372,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -7923,7 +7923,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -8498,7 +8498,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -9121,7 +9121,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -10144,7 +10144,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.033</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml
index cab9dd4f57..6a8ddabd73 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.344</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -1440,7 +1440,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -2705,7 +2705,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -3871,7 +3871,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.063</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -4488,7 +4488,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5086,7 +5086,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -5661,7 +5661,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -6763,7 +6763,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -7380,7 +7380,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -8064,7 +8064,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -8685,7 +8685,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -9321,7 +9321,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -9996,7 +9996,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -11121,7 +11121,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -11742,7 +11742,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml
index ffebc4dcaf..92784ab18d 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.344</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -738,7 +738,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -1397,7 +1397,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -1963,7 +1963,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.063</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2106,7 +2106,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2248,7 +2248,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2385,7 +2385,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2638,7 +2638,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2781,7 +2781,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3045,7 +3045,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3246,7 +3246,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3447,7 +3447,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3672,7 +3672,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4377,7 +4377,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4578,7 +4578,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.031</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml
index 6fa7045577..cd82d030fa 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_singleAgainstRange__Actions.getPageUrls_day.xml
@@ -20,7 +20,7 @@
 				<revenue>15</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>3</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.375</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>15</revenue_attrib>
 				<revenue_entry>15</revenue_entry>
@@ -724,7 +724,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.25</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -1108,7 +1108,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1404,7 +1404,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1620,7 +1620,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.125</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml
index 45f7d68120..c22a05172a 100644
--- a/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_subtableActions__Actions.getPageUrls_month.xml
@@ -20,7 +20,7 @@
 				<revenue>50</revenue>
 				<nb_conv_pages_before>10</nb_conv_pages_before>
 				<nb_conversions_attrib>10</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.909</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>10</nb_conversions_page_uniq>
 				<revenue_attrib>50</revenue_attrib>
 				<revenue_entry>50</revenue_entry>
@@ -893,7 +893,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.091</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
index 415090c382..8f5554f5c8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
@@ -23,7 +23,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.231</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -66,7 +66,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.231</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -108,7 +108,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -150,7 +150,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -193,7 +193,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -236,7 +236,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -279,7 +279,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -322,7 +322,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
index a84ab1eded..8e72f191a3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
@@ -38,7 +38,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.203</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -101,7 +101,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -164,7 +164,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -227,7 +227,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -289,7 +289,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -351,7 +351,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -414,7 +414,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -477,7 +477,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -539,7 +539,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -601,7 +601,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -664,7 +664,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -727,7 +727,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -790,7 +790,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -853,7 +853,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -916,7 +916,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 7809acc9e4..fd30228d0f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.282</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -422,7 +422,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.103</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -665,7 +665,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.103</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -908,7 +908,7 @@
 				<revenue>15</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>3</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.077</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>15</revenue_attrib>
 				<revenue_entry>15</revenue_entry>
@@ -952,7 +952,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.077</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -1231,7 +1231,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1430,7 +1430,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1513,7 +1513,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1556,7 +1556,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1599,7 +1599,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1643,7 +1643,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1687,7 +1687,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1770,7 +1770,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1892,7 +1892,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1975,7 +1975,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2058,7 +2058,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2141,7 +2141,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>3.3333</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2224,7 +2224,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2619,7 +2619,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2702,7 +2702,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index bbd2951d3e..b7a0ec3307 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -38,7 +38,7 @@
 				<revenue>70</revenue>
 				<nb_conv_pages_before>14</nb_conv_pages_before>
 				<nb_conversions_attrib>14</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.275</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>14</nb_conversions_page_uniq>
 				<revenue_attrib>70</revenue_attrib>
 				<revenue_entry>70</revenue_entry>
@@ -974,7 +974,7 @@
 				<revenue>35</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>7</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.137</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>7</nb_conversions_page_uniq>
 				<revenue_attrib>35</revenue_attrib>
 				<revenue_entry>35</revenue_entry>
@@ -1038,7 +1038,7 @@
 				<revenue>25</revenue>
 				<nb_conv_pages_before>5</nb_conv_pages_before>
 				<nb_conversions_attrib>5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.098</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>5</nb_conversions_page_uniq>
 				<revenue_attrib>25</revenue_attrib>
 				<revenue_entry>25</revenue_entry>
@@ -1486,7 +1486,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.078</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -1824,7 +1824,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.059</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2213,7 +2213,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2492,7 +2492,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2664,7 +2664,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.039</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2782,7 +2782,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.039</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2900,7 +2900,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2964,7 +2964,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3027,7 +3027,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3090,7 +3090,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3154,7 +3154,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3218,7 +3218,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3335,7 +3335,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3451,7 +3451,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3569,7 +3569,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3687,7 +3687,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3805,7 +3805,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>3.3333</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3923,7 +3923,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4473,7 +4473,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4591,7 +4591,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
index ce5b0371ac..0fb97626f8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
@@ -23,7 +23,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.231</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -66,7 +66,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.231</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -109,7 +109,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -175,7 +175,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -218,7 +218,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -261,7 +261,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -304,7 +304,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
index 6cd501585a..0535e1aa48 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
@@ -38,7 +38,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.203</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -101,7 +101,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -164,7 +164,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -227,7 +227,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -290,7 +290,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -396,7 +396,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -459,7 +459,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -565,7 +565,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -671,7 +671,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -734,7 +734,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -797,7 +797,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -860,7 +860,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -923,7 +923,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index c5b120a179..9e059f5bbe 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.282</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -422,7 +422,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.103</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -665,7 +665,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.103</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -908,7 +908,7 @@
 				<revenue>15</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>3</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.077</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>15</revenue_attrib>
 				<revenue_entry>15</revenue_entry>
@@ -952,7 +952,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.077</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -1231,7 +1231,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1412,7 +1412,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1495,7 +1495,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1539,7 +1539,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1607,7 +1607,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1651,7 +1651,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1734,7 +1734,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1856,7 +1856,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1939,7 +1939,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2022,7 +2022,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2105,7 +2105,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>3.3333</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2188,7 +2188,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2583,7 +2583,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2666,7 +2666,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index b56e45417a..55fd3a3253 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -38,7 +38,7 @@
 				<revenue>70</revenue>
 				<nb_conv_pages_before>14</nb_conv_pages_before>
 				<nb_conversions_attrib>14</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.275</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>14</nb_conversions_page_uniq>
 				<revenue_attrib>70</revenue_attrib>
 				<revenue_entry>70</revenue_entry>
@@ -974,7 +974,7 @@
 				<revenue>35</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>7</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.137</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>7</nb_conversions_page_uniq>
 				<revenue_attrib>35</revenue_attrib>
 				<revenue_entry>35</revenue_entry>
@@ -1038,7 +1038,7 @@
 				<revenue>25</revenue>
 				<nb_conv_pages_before>5</nb_conv_pages_before>
 				<nb_conversions_attrib>5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.098</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>5</nb_conversions_page_uniq>
 				<revenue_attrib>25</revenue_attrib>
 				<revenue_entry>25</revenue_entry>
@@ -1486,7 +1486,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.078</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -1824,7 +1824,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.059</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2213,7 +2213,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2474,7 +2474,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2682,7 +2682,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.039</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2800,7 +2800,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.039</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2918,7 +2918,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2982,7 +2982,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3046,7 +3046,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3154,7 +3154,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3218,7 +3218,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3415,7 +3415,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3533,7 +3533,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3651,7 +3651,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3769,7 +3769,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>3.3333</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3887,7 +3887,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4437,7 +4437,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4555,7 +4555,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 0e232d7754..5d08e8c3cc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -44,7 +44,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.231</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -87,7 +87,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.231</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -129,7 +129,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -171,7 +171,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -237,7 +237,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -280,7 +280,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -323,7 +323,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -366,7 +366,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.115</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 26daa7e156..ac35b2fa1b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -79,7 +79,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.203</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -142,7 +142,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -205,7 +205,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -268,7 +268,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.102</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -330,7 +330,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -392,7 +392,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -498,7 +498,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -561,7 +561,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -623,7 +623,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -728,7 +728,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -834,7 +834,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -897,7 +897,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -960,7 +960,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1023,7 +1023,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1086,7 +1086,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_month.xml
index af8d6a85fd..08f69ca058 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_month.xml
@@ -20,7 +20,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_range.xml
index af8d6a85fd..08f69ca058 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_range.xml
@@ -20,7 +20,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
index 24c4f5b658..cc3d002caf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
@@ -22,7 +22,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index 8094e4ab45..b2109cec1d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -23,7 +23,7 @@
 				<revenue>55</revenue>
 				<nb_conv_pages_before>11</nb_conv_pages_before>
 				<nb_conversions_attrib>11</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.282</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>11</nb_conversions_page_uniq>
 				<revenue_attrib>55</revenue_attrib>
 				<revenue_entry>55</revenue_entry>
@@ -422,7 +422,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.103</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -665,7 +665,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.103</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -908,7 +908,7 @@
 				<revenue>15</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>3</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.077</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>15</revenue_attrib>
 				<revenue_entry>15</revenue_entry>
@@ -952,7 +952,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.077</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -1231,7 +1231,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1451,7 +1451,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.051</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1534,7 +1534,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1577,7 +1577,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1620,7 +1620,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1688,7 +1688,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1732,7 +1732,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1815,7 +1815,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -1937,7 +1937,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2020,7 +2020,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2103,7 +2103,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2186,7 +2186,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>3.3333</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2269,7 +2269,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2664,7 +2664,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2747,7 +2747,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.026</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 58e887c092..7aa3f8defa 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -38,7 +38,7 @@
 				<revenue>70</revenue>
 				<nb_conv_pages_before>14</nb_conv_pages_before>
 				<nb_conversions_attrib>14</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.275</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>14</nb_conversions_page_uniq>
 				<revenue_attrib>70</revenue_attrib>
 				<revenue_entry>70</revenue_entry>
@@ -974,7 +974,7 @@
 				<revenue>35</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>7</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.137</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>7</nb_conversions_page_uniq>
 				<revenue_attrib>35</revenue_attrib>
 				<revenue_entry>35</revenue_entry>
@@ -1038,7 +1038,7 @@
 				<revenue>25</revenue>
 				<nb_conv_pages_before>5</nb_conv_pages_before>
 				<nb_conversions_attrib>5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.098</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>5</nb_conversions_page_uniq>
 				<revenue_attrib>25</revenue_attrib>
 				<revenue_entry>25</revenue_entry>
@@ -1486,7 +1486,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>4</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.078</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>4</nb_conversions_page_uniq>
 				<revenue_attrib>20</revenue_attrib>
 				<revenue_entry>20</revenue_entry>
@@ -1824,7 +1824,7 @@
 				<revenue>20</revenue>
 				<nb_conv_pages_before>7</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.059</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>3</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2213,7 +2213,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2528,7 +2528,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2736,7 +2736,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>2</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.039</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>10</revenue_attrib>
 				<revenue_entry>10</revenue_entry>
@@ -2854,7 +2854,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>4</nb_conv_pages_before>
 				<nb_conversions_attrib>1.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.039</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
 				<revenue_attrib>6.6667</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -2972,7 +2972,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3036,7 +3036,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3099,7 +3099,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3162,7 +3162,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3270,7 +3270,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3334,7 +3334,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3451,7 +3451,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3646,7 +3646,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3764,7 +3764,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -3882,7 +3882,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4000,7 +4000,7 @@
 				<revenue>10</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>3.3333</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4118,7 +4118,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4668,7 +4668,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
@@ -4786,7 +4786,7 @@
 				<revenue>5</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>0.02</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>5</revenue_attrib>
 				<revenue_entry>5</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
index d7dbbe678f..46547c2279 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
@@ -104,7 +104,7 @@
 				<revenue_entry>40</revenue_entry>
 				<revenue_per_entry>10</revenue_per_entry>
 				<nb_conversions_entry>8</nb_conversions_entry>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_entry_rate>2</nb_conversions_entry_rate>
 			</row>
 			<row idgoal="2">
@@ -117,7 +117,7 @@
 				<revenue_entry>20</revenue_entry>
 				<revenue_per_entry>5</revenue_per_entry>
 				<nb_conversions_entry>4</nb_conversions_entry>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_entry_rate>1</nb_conversions_entry_rate>
 			</row>
 		</goals>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
index 51fb84643e..d4f641848c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
@@ -40,7 +40,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
@@ -162,7 +162,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
index a0d3155b13..cf78099eb9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
@@ -41,7 +41,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -104,7 +104,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
index fd2b920318..37c181200b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
@@ -40,7 +40,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
index 76eeeef420..0df8ac1efc 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
@@ -86,7 +86,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
index 1411e88b4c..55159a0108 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
@@ -19,7 +19,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
index 7acacdf1e2..7bd032a648 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
@@ -40,7 +40,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
@@ -162,7 +162,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -265,7 +265,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
index ececcccc6a..c358b23fc9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
@@ -36,7 +36,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 			</row>
@@ -142,7 +142,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -205,7 +205,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
index df0fa1183c..156fb35299 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
@@ -103,7 +103,7 @@
 				<revenue_entry>42</revenue_entry>
 				<revenue_per_entry>42</revenue_per_entry>
 				<nb_conversions_entry>1</nb_conversions_entry>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>2</nb_conversions_page_rate>
 				<nb_conversions_entry_rate>1</nb_conversions_entry_rate>
 			</row>
 			<row idgoal="2">
@@ -116,7 +116,7 @@
 				<revenue_entry>1</revenue_entry>
 				<revenue_per_entry>1</revenue_per_entry>
 				<nb_conversions_entry>1</nb_conversions_entry>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_entry_rate>1</nb_conversions_entry_rate>
 			</row>
 		</goals>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
index 6b6c078864..f1a4920392 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
@@ -114,7 +114,7 @@
 				<revenue_entry>1</revenue_entry>
 				<revenue_per_entry>1</revenue_per_entry>
 				<nb_conversions_entry>1</nb_conversions_entry>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_entry_rate>1</nb_conversions_entry_rate>
 			</row>
 			<row idgoal="1">
@@ -127,7 +127,7 @@
 				<revenue_entry>42</revenue_entry>
 				<revenue_per_entry>42</revenue_per_entry>
 				<nb_conversions_entry>1</nb_conversions_entry>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>2</nb_conversions_page_rate>
 				<nb_conversions_entry_rate>1</nb_conversions_entry_rate>
 			</row>
 		</goals>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
index 84de520d76..a1d11d795b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
@@ -36,7 +36,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
@@ -146,7 +146,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -247,7 +247,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
index b71090a998..8e86658f3f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
@@ -38,7 +38,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
@@ -156,7 +156,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
index 7391f4e953..ea60bc89ae 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
@@ -39,7 +39,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -100,7 +100,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
index a0283c9de2..af329b6710 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
@@ -38,7 +38,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
index dd418af816..93e15c29e3 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
@@ -83,7 +83,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
index 92bb1a3a1a..f623bebafa 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
@@ -23,7 +23,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
index 197cb49f13..b3fe52346c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
@@ -38,7 +38,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
@@ -156,7 +156,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -256,7 +256,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
index cd6c5f0164..72a338d86e 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
@@ -34,7 +34,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 			</row>
@@ -137,7 +137,7 @@
 				<revenue>42</revenue>
 				<nb_conv_pages_before>2</nb_conv_pages_before>
 				<nb_conversions_attrib>0.5</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>21</revenue_attrib>
 				<revenue_entry>42</revenue_entry>
@@ -198,7 +198,7 @@
 				<revenue>1</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>1</revenue_attrib>
 				<revenue_entry>1</revenue_entry>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
index 4ee05d3286..e5382224b9 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
@@ -4087,7 +4087,7 @@
 			<id>General_Overview</id>
 			<name>Overview</name>
 			<order>2</order>
-			<help>&lt;p&gt;The Goals Overview reports on the performance of the goals defined for your website. You can access your goal&#x2019;s conversion percentages, amount of revenue generated and full reports for each.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href="https://matomo.org/docs/tracking-goals-web-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank"&gt;Learn more in our Goals guide here.&lt;/a&gt;&lt;/p&gt;</help>
+			<help>&lt;p&gt;The Goals Overview reports on the performance of the goals defined for your website. You can access your goal’s conversion percentages, amount of revenue generated and full reports for each.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://matomo.org/docs/tracking-goals-web-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides&quot; rel=&quot;noreferrer noopener&quot; target=&quot;_blank&quot;&gt;Learn more in our Goals guide here.&lt;/a&gt;&lt;/p&gt;</help>
 		</subcategory>
 		<widgets>
 			<row>
@@ -4939,7 +4939,7 @@
 			<id>General_Overview</id>
 			<name>Overview</name>
 			<order>2</order>
-			<help>&lt;p&gt;The Ecommerce Overview section is the best place to get a high-level view of your online store&#x2019;s performance. At a glance, you can see how many sales you&#x2019;re making, how much revenue you are generating, and your website&#x2019;s conversion rate.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href="https://matomo.org/docs/ecommerce-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank"&gt;Learn more in our Ecommerce guide here.&lt;/a&gt;&lt;/p&gt;</help>
+			<help>&lt;p&gt;The Ecommerce Overview section is the best place to get a high-level view of your online store’s performance. At a glance, you can see how many sales you’re making, how much revenue you are generating, and your website’s conversion rate.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://matomo.org/docs/ecommerce-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides&quot; rel=&quot;noreferrer noopener&quot; target=&quot;_blank&quot;&gt;Learn more in our Ecommerce guide here.&lt;/a&gt;&lt;/p&gt;</help>
 		</subcategory>
 		<widgets>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 6193b364cb..1cb8e1b65c 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -1977,7 +1977,7 @@
 			<id>General_Overview</id>
 			<name>Overview</name>
 			<order>2</order>
-			<help>&lt;p&gt;The Ecommerce Overview section is the best place to get a high-level view of your online store&#x2019;s performance. At a glance, you can see how many sales you&#x2019;re making, how much revenue you are generating, and your website&#x2019;s conversion rate.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href="https://matomo.org/docs/ecommerce-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank"&gt;Learn more in our Ecommerce guide here.&lt;/a&gt;&lt;/p&gt;</help>
+			<help>&lt;p&gt;The Ecommerce Overview section is the best place to get a high-level view of your online store’s performance. At a glance, you can see how many sales you’re making, how much revenue you are generating, and your website’s conversion rate.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://matomo.org/docs/ecommerce-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides&quot; rel=&quot;noreferrer noopener&quot; target=&quot;_blank&quot;&gt;Learn more in our Ecommerce guide here.&lt;/a&gt;&lt;/p&gt;</help>
 		</subcategory>
 		<module>CoreHome</module>
 		<action>renderWidgetContainer</action>
@@ -2959,7 +2959,7 @@
 			<id>General_Overview</id>
 			<name>Overview</name>
 			<order>2</order>
-			<help>&lt;p&gt;The Goals Overview reports on the performance of the goals defined for your website. You can access your goal&#x2019;s conversion percentages, amount of revenue generated and full reports for each.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href="https://matomo.org/docs/tracking-goals-web-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides" rel="noreferrer noopener" target="_blank"&gt;Learn more in our Goals guide here.&lt;/a&gt;&lt;/p&gt;</help>
+			<help>&lt;p&gt;The Goals Overview reports on the performance of the goals defined for your website. You can access your goal’s conversion percentages, amount of revenue generated and full reports for each.&lt;/p&gt;&lt;p&gt;Click on an individual metric within the sparkline chart to focus on it within the full-sized evolution graph.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://matomo.org/docs/tracking-goals-web-analytics/?mtm_campaign=App_Help&amp;mtm_source=Matomo_App&amp;mtm_keyword=UserGuides&quot; rel=&quot;noreferrer noopener&quot; target=&quot;_blank&quot;&gt;Learn more in our Goals guide here.&lt;/a&gt;&lt;/p&gt;</help>
 		</subcategory>
 		<module>CoreHome</module>
 		<action>renderWidgetContainer</action>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
index 11d2b247d2..89d69ecab0 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
@@ -20,7 +20,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>1000</revenue_entry>
@@ -33,7 +33,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -69,7 +69,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml
index 11d2b247d2..89d69ecab0 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml
@@ -20,7 +20,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.3333</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>1000</revenue_entry>
@@ -33,7 +33,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>1</nb_conv_pages_before>
 				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 				<revenue_entry>0</revenue_entry>
@@ -69,7 +69,7 @@
 				<revenue>0</revenue>
 				<nb_conv_pages_before>3</nb_conv_pages_before>
 				<nb_conversions_attrib>0.6667</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_rate>1</nb_conversions_page_rate>
 				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 				<revenue_attrib>0</revenue_attrib>
 			</row>