diff --git a/core/ArchiveProcessing/Period.php b/core/ArchiveProcessing/Period.php
index a8cadf756a8d79529ee4de910ea917a90d8f540c..80dc14d3576f1cb23859aa74015e827dbfa7f8dd 100644
--- a/core/ArchiveProcessing/Period.php
+++ b/core/ArchiveProcessing/Period.php
@@ -385,7 +385,6 @@ class Piwik_ArchiveProcessing_Period extends Piwik_ArchiveProcessing
 		if(!self::$enablePurgeOutdated) {
 			return;
 		}
-		debug_print_backtrace();
 		$blobTable = str_replace("numeric", "blob", $numericTable);
 		$key = self::FLAG_TABLE_PURGED . $blobTable;
 		$timestamp = Piwik_GetOption($key);
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
index 4c8b59a216ab88240d29cdce34966a6b8c504d0c..2fcbc697d34e0daf7a8321cff19a774a71f51da8 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
@@ -161,10 +161,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ
         // Second new visitor on Idsite 1: one page view
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
-        // calc token auth by hand in test environment
-        $tokenAuth = md5(
-            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
-        $visitorB->setTokenAuth($tokenAuth);
+	    $visitorB->setTokenAuth(self::getTokenAuth());
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
index cf0d96dbf265a71e176909ea16fc6f9d04b4cc02..7efe285ce1da79085dcd6fa1a7e62da673d5af86 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
@@ -113,9 +113,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisa
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
         // calc token auth by hand in test environment
-        $tokenAuth = md5(
-            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
-        $visitorB->setTokenAuth($tokenAuth);
+        $visitorB->setTokenAuth(self::getTokenAuth());
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
index c70a5fa2d97516b8b1af7e8831f8de4f717b7172..c185025939700987f9aadc5be09c3003f66ab664 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
@@ -155,9 +155,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
         $visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
         $visitorB->enableBulkTracking();
         // calc token auth by hand in test environment
-        $tokenAuth = md5(
-            Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
-        $visitorB->setTokenAuth($tokenAuth);
+	    $visitorB->setTokenAuth(self::getTokenAuth());
         $visitorB->setIp('100.52.156.83');
         $visitorB->setResolution(800, 300);
         $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
index c38492713c68d9a42109ad15e4678ee833b4a0ef..2e13a3b7052e853ae88a8bc762dc8d6460dd3b7a 100755
--- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
@@ -615,12 +615,12 @@ class PrivacyManagerTest extends IntegrationTestCase
         //   - http://whatever.com/42/{$daysSinceLastVisit}
         
         $start = Piwik_Date::factory(self::$dateTime);
-        self::createWebsite('2012-01-01', $ecommerce=1);
+	    self::$idSite = self::createWebsite('2012-01-01', $ecommerce=1);
         $idGoal = Piwik_Goals_API::getInstance()->addGoal(self::$idSite, 'match all', 'url', 'http', 'contains');
         
         $t = IntegrationTestCase::getTracker(self::$idSite, $start, $defaultInit = true);
         $t->enableBulkTracking();
-        $t->setTokenAuth(IntegrationTestCase::getTokenAuth());
+        $t->setTokenAuth(self::getTokenAuth());
         for ($daysAgo = self::$daysAgoStart; $daysAgo >= 0; $daysAgo -= 5) // one visit every 5 days
         {
             $dateTime = $start->subDay($daysAgo)->toString();