- implemented the SORT filter

- implemented the EXCLUDE LOW POPULATION filter
- implemented the callback filter
- implemented the HTML renderer 
- wrote API for UserSettings (prepared logos etc.)
- started API for Actions 
- 

git-svn-id: http://dev.piwik.org/svn/trunk@48 59fd770c-687e-43c8-a1e3-f5a4ff64c105

5 files changed, 334 insertions, 211 deletions

diff --git a/tests/modules/ArchiveProcessing/Day.test.php b/tests/modules/ArchiveProcessing/Day.test.php
index aac006869f..6bcaf59d8f 100644
--- a/tests/modules/ArchiveProcessing/Day.test.php
+++ b/tests/modules/ArchiveProcessing/Day.test.php
@@ -185,10 +185,10 @@ class Test_Piwik_ArchiveProcessing_Day extends UnitTestCase
 		// WHAT WE TEST
 		$input = array(
 		'cat1' => array(
+				'pagecat1' => $rowcat1,
 				'cat2' => array(
 					'pagecat2' => $rowcat2,
 					),
-				'pagecat1' => $rowcat1,
 				),
 		);				
 		$tableGenerated = Piwik_ArchiveProcessing_Day::generateDataTable($input);
diff --git a/tests/modules/DataTable.test.php b/tests/modules/DataTable.test.php
index ed01b88be4..e99b732cc4 100644
--- a/tests/modules/DataTable.test.php
+++ b/tests/modules/DataTable.test.php
@@ -149,7 +149,7 @@ class Test_Piwik_DataTable extends UnitTestCase
 	  	
 	  	);  	
 	  	
-	  	$expected="- 1 ['visits' => 245, 'visitors' => 245] ['logo' => test.png] [idsubtable = ]<br>\n";
+	  	$expected="- 1 ['visits' => 245, 'visitors' => 245] ['logo' => 'test.png'] [idsubtable = ]<br>\n";
 	  	
 	  	/*
 	  	 * RENDER
@@ -200,7 +200,7 @@ class Test_Piwik_DataTable extends UnitTestCase
 	  	
 	  	
 	  	$expected=
-"- 1 ['visits' => 245, 'visitors' => 245] ['logo' => test.png] [idsubtable = ]<br>
+"- 1 ['visits' => 245, 'visitors' => 245] ['logo' => 'test.png'] [idsubtable = ]<br>
 - 2 ['visits' => 3] [] [idsubtable = $idsubtable1]<br>
 *- 1 ['visits' => 1] [] [idsubtable = $idsubsubtable]<br>
 **- 1 ['visits' => 2] [] [idsubtable = ]<br>
@@ -467,6 +467,131 @@ class Test_Piwik_DataTable extends UnitTestCase
 	  	
 	  	$this->assertEqual(array_values($table->getRows()), array_values($expectedtable->getRows()));
 	 }
+	/**
+	 * Test to sort by label
+	 */
+	 function test_filter_SortString()
+	 {
+	 	
+	 	$idcol = Piwik_DataTable_Row::COLUMNS;
+	 	
+	  	$table = new Piwik_DataTable;
+	 	$rows = array(
+	  		array( $idcol => array('label'=>'google')),//0
+	  		array( $idcol => array('label'=>'ask')),//1
+	  		array( $idcol => array('label'=>'piwik')),//2
+	  		array( $idcol => array('label'=>'yahoo')),//3
+	  		array( $idcol => array('label'=>'amazon')),//4
+	  		array( $idcol => array('label'=>'238975247578949')),//5
+	  		array( $idcol => array('label'=>'Q*(%&*("$&%*(&"$*")"))'))//6
+	  		);
+	  	$table->loadFromArray( $rows );
+	  	
+	  	$expectedtable = new Piwik_DataTable;
+	 	$rows = array(
+	  		array( $idcol => array('label'=>'238975247578949')),//5
+	  		array( $idcol => array('label'=>'amazon')),//4
+	  		array( $idcol => array('label'=>'ask')),//1
+	  		array( $idcol => array('label'=>'google')),//0
+	  		array( $idcol => array('label'=>'piwik')),//2
+	  		array( $idcol => array('label'=>'Q*(%&*("$&%*(&"$*")"))')),//6
+	  		array( $idcol => array('label'=>'yahoo')),//3
+	  		);
+	  	$expectedtable->loadFromArray( $rows );
+	  	
+	  	$expectedtableReverse = new Piwik_DataTable;
+	  	$expectedtableReverse->loadFromArray(array_reverse($rows));
+	  		  	
+	 	$filter = new Piwik_DataTable_Filter_Sort($table, 'label', 'asc');
+	 	$this->assertTrue(Piwik_DataTable::isEqual($expectedtable,$table));
+	  	
+	  	$filter = new Piwik_DataTable_Filter_Sort($table, 'label', 'desc');
+	  	$this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtableReverse));
+	 
+	 }
+	
+	/**
+	 * Test to sort by visit
+	 */
+	 function test_filter_SortNumeric()
+	 {
+	 	
+	 	$idcol = Piwik_DataTable_Row::COLUMNS;
+	 	
+	  	$table = new Piwik_DataTable;
+	 	$rows = array(
+	  		array( $idcol => array('label'=>'google', 	'nb_visits' => 897)),//0
+	  		array( $idcol => array('label'=>'ask', 		'nb_visits' => -152)),//1
+	  		array( $idcol => array('label'=>'piwik', 	'nb_visits' => 1.5)),//2
+	  		array( $idcol => array('label'=>'yahoo', 	'nb_visits' => 154)),//3
+	  		array( $idcol => array('label'=>'amazon', 	'nb_visits' => 30)),//4
+	  		array( $idcol => array('label'=>'238949', 	'nb_visits' => 0)),//5
+	  		array( $idcol => array('label'=>'Q*(%&*', 	'nb_visits' => 1)),//6
+	  		);
+	  	$table->loadFromArray( $rows );
+	  	
+	  	$expectedtable = new Piwik_DataTable;
+	 	$rows = array(
+	  		array( $idcol => array('label'=>'ask', 		'nb_visits' => -152)),//1
+	  		array( $idcol => array('label'=>'238949', 	'nb_visits' => 0)),//5
+	  		array( $idcol => array('label'=>'Q*(%&*', 	'nb_visits' => 1)),//6
+	  		array( $idcol => array('label'=>'piwik', 	'nb_visits' => 1.5)),//2
+	  		array( $idcol => array('label'=>'amazon', 	'nb_visits' => 30)),//4
+	  		array( $idcol => array('label'=>'yahoo', 	'nb_visits' => 154)),//3
+	  		array( $idcol => array('label'=>'google', 	'nb_visits' => 897)),//0
+	  		);
+	  	$expectedtable->loadFromArray( $rows );
+	  	
+	  	$expectedtableReverse = new Piwik_DataTable;
+	  	$expectedtableReverse->loadFromArray(array_reverse($rows));
+	  		  	
+	 	$filter = new Piwik_DataTable_Filter_Sort($table, 'nb_visits', 'asc');
+	  	$this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtable));
+	  	
+	  	$filter = new Piwik_DataTable_Filter_Sort($table, 'nb_visits', 'desc');
+	  	$this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtableReverse));
+	 }
+	
+	
+	/**
+	 * Test to exclude low population filter
+	 */
+	 function test_filter_Lowpop1()
+	 {
+	 	
+	 	$idcol = Piwik_DataTable_Row::COLUMNS;
+	 	
+	  	$table = new Piwik_DataTable;
+	 	$rows = array(
+	  		array( $idcol => array('label'=>'google', 	'nb_visits' => 897)),//0
+	  		array( $idcol => array('label'=>'ask', 		'nb_visits' => -152)),//1
+	  		array( $idcol => array('label'=>'piwik', 	'nb_visits' => 1.5)),//2
+	  		array( $idcol => array('label'=>'piwik2', 	'nb_visits' => 1.4)),//2
+	  		array( $idcol => array('label'=>'yahoo', 	'nb_visits' => 154)),//3
+	  		array( $idcol => array('label'=>'amazon', 	'nb_visits' => 30)),//4
+	  		array( $idcol => array('label'=>'238949', 	'nb_visits' => 0)),//5
+	  		array( $idcol => array('label'=>'Q*(%&*', 	'nb_visits' => 1)),//6
+	  		array( $idcol => array('label'=>'Q*(%&*2', 	'nb_visits' => -1.5)),//6
+	  		);
+	  	$table->loadFromArray( $rows );
+	  	
+	  	$expectedtable = new Piwik_DataTable;
+	 	$rows = array(
+	  		array( $idcol => array('label'=>'google', 	'nb_visits' => 897)),//0
+	 		array( $idcol => array('label'=>'piwik', 	'nb_visits' => 1.5)),//2
+	  		array( $idcol => array('label'=>'piwik2', 	'nb_visits' => 1.4)),//2
+	  		array( $idcol => array('label'=>'yahoo', 	'nb_visits' => 154)),//3
+	  		array( $idcol => array('label'=>'amazon', 	'nb_visits' => 30)),//4
+		);
+	  	$expectedtable->loadFromArray( $rows );
+	  	
+	 	$filter = new Piwik_DataTable_Filter_ExcludeLowPopulation($table, 'nb_visits', 1.4);
+
+//	  	echo $table;
+//	  	echo $expectedtable;
+//	  	dump($table);
+	  	$this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtable));
+	 }
 	
 	
 	/**
@@ -586,9 +711,9 @@ class Test_Piwik_DataTable extends UnitTestCase
 		$rowsExpected = array(
 	  		array( $idcol => array('label'=>'google', 'visits' => 1)),
 	  		array( $idcol => array('label'=>'ask', 'visits' => 113)),
+	  		array( $idcol => array('label'=>'123', 'visits' => 4)),
 	  		array( $idcol => array('label'=>'test', 'visits' => 1)),
 	  		array( $idcol => array('label'=>' google ', 'visits' => 5)),
-	  		array( $idcol => array('label'=>'123', 'visits' => 4)),
   		);	  	
 	  	$tableExpected = new Piwik_DataTable;
 	  	$tableExpected->loadFromArray( $rowsExpected );
@@ -674,9 +799,9 @@ class Test_Piwik_DataTable extends UnitTestCase
 	  
 		$rowsExpected = array(
 	  		array( $idcol => array('label'=>'google', 'visits' => 1)),
+	  		array( $idcol => array('label'=>'ask', 'visits' => 90)),
 	  		array( $idcol => array('label'=>'123', 'visits' => 2)),
 	  		array( $idcol => array('label'=>'google2', 'visits' => -2)),
-	  		array( $idcol => array('label'=>'ask', 'visits' => 90)),
 	  		array( $idcol => array('label'=>'123456', 'visits' => 1.5)),
 	  		array( $idcol => array('label'=>'123ab', 'visits' => 1.5)),
   		);
diff --git a/tests/modules/Database.test.php b/tests/modules/Database.test.php
index 8e68d784d4..d161f1bb7f 100755
--- a/tests/modules/Database.test.php
+++ b/tests/modules/Database.test.php
@@ -43,7 +43,7 @@ class FakeAccess
 		}
 		else
 		{
-			$websitesAccess=Piwik_SitesManager::getAllSitesId();
+			$websitesAccess=Piwik_SitesManager_API::getAllSitesId();
 		}
 		
 		if(!is_array($idSites))
@@ -68,7 +68,7 @@ class FakeAccess
 		}
 		else
 		{
-			$websitesAccess=Piwik_SitesManager::getAllSitesId();
+			$websitesAccess=Piwik_SitesManager_API::getAllSitesId();
 		}
 		
 		if(!is_array($idSites))
@@ -109,7 +109,7 @@ class FakeAccess
 	{
 		if(self::$superUser)
 		{
-			return Piwik_SitesManager::getAllSitesId();
+			return Piwik_SitesManager_API::getAllSitesId();
 		}
 		return  self::$idSitesAdmin;
 	}
@@ -118,7 +118,7 @@ class FakeAccess
 	{
 		if(self::$superUser)
 		{
-			return Piwik_SitesManager::getAllSitesId();
+			return Piwik_SitesManager_API::getAllSitesId();
 		}
 		return  self::$idSitesView;
 	}
@@ -126,7 +126,7 @@ class FakeAccess
 	{
 		if(self::$superUser)
 		{
-			return Piwik_SitesManager::getAllSitesId();
+			return Piwik_SitesManager_API::getAllSitesId();
 		}
 		return  array_merge(self::$idSitesView,self::$idSitesAdmin);
 	}
diff --git a/tests/modules/SitesManager.test.php b/tests/modules/SitesManager.test.php
index 7520be31c7..11885337e4 100755
--- a/tests/modules/SitesManager.test.php
+++ b/tests/modules/SitesManager.test.php
@@ -8,8 +8,7 @@ if(!defined('CONFIG_TEST_INCLUDED'))
 }
 require_once "Database.test.php";
 
-
-Zend_Loader::loadClass('Piwik_SitesManager');
+require_once 'SitesManager.php';
 
 class Test_Piwik_SitesManager extends Test_Database
 {
@@ -34,7 +33,7 @@ class Test_Piwik_SitesManager extends Test_Database
 	public function test_addSite_emptyName()
     {
     	try {
-    		Piwik_SitesManager::addSite("",array("http://piwik.net"));
+    		Piwik_SitesManager_API::addSite("",array("http://piwik.net"));
     	}
     	catch (Exception $expected) {
             return;
@@ -48,7 +47,7 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite_noUrls()
     {
     	try {
-    		Piwik_SitesManager::addSite("name",array());
+    		Piwik_SitesManager_API::addSite("name",array());
     	}
     	catch (Exception $expected) {
             return;
@@ -62,7 +61,7 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite_wrongUrls1()
     {
     	try {
-    		Piwik_SitesManager::addSite("name",array(""));
+    		Piwik_SitesManager_API::addSite("name",array(""));
     	}
     	catch (Exception $expected) {
             return;
@@ -75,7 +74,7 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite_wrongUrls2()
     {
     	try {
-    		Piwik_SitesManager::addSite("name","");
+    		Piwik_SitesManager_API::addSite("name","");
     	}
     	catch (Exception $expected) {
             return;
@@ -89,7 +88,7 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite_wrongUrls3()
     {
     	try {
-    		Piwik_SitesManager::addSite("name","httpww://piwik.net");
+    		Piwik_SitesManager_API::addSite("name","httpww://piwik.net");
     	}
     	catch (Exception $expected) {
             return;
@@ -103,7 +102,7 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite_wrongUrls4()
     {
     	try {
-    		Piwik_SitesManager::addSite("name","httpww://piwik.net/gqg~#");
+    		Piwik_SitesManager_API::addSite("name","httpww://piwik.net/gqg~#");
     	}
     	catch (Exception $expected) {
             return;
@@ -118,13 +117,13 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$url = "http://piwik.net/";
     	$urlOK = "http://piwik.net";
-    	$idsite = Piwik_SitesManager::addSite("name",$url);
+    	$idsite = Piwik_SitesManager_API::addSite("name",$url);
     	$this->assertIsA( $idsite,'int');
     	
-    	$siteInfo = Piwik_SitesManager::getSiteFromId($idsite);
+    	$siteInfo = Piwik_SitesManager_API::getSiteFromId($idsite);
     	$this->assertEqual($siteInfo['main_url'], $urlOK);
     	
-    	$siteUrls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	$this->assertTrue(count($siteUrls)===1);
     }
     
@@ -135,13 +134,13 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$urls = array("http://piwik.net/","http://piwik.com","https://piwik.net/test/");
     	$urlsOK = array("http://piwik.net","http://piwik.com","https://piwik.net/test");
-    	$idsite = Piwik_SitesManager::addSite("super website",$urls);
+    	$idsite = Piwik_SitesManager_API::addSite("super website",$urls);
     	$this->assertIsA( $idsite,'int');
     	
-    	$siteInfo = Piwik_SitesManager::getSiteFromId($idsite);
+    	$siteInfo = Piwik_SitesManager_API::getSiteFromId($idsite);
     	$this->assertEqual($siteInfo['main_url'], $urlsOK[0]);
     	
-    	$siteUrls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	$this->assertEqual($siteUrls, $urlsOK);
     }
     
@@ -151,10 +150,10 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite_strangeName()
     {
     	$name = "supertest(); ~@@()''!£\$'%%^'!£";
-    	$idsite = Piwik_SitesManager::addSite($name,"http://piwik.net");
+    	$idsite = Piwik_SitesManager_API::addSite($name,"http://piwik.net");
     	$this->assertIsA( $idsite,'int');
     	
-    	$siteInfo = Piwik_SitesManager::getSiteFromId($idsite);
+    	$siteInfo = Piwik_SitesManager_API::getSiteFromId($idsite);
     	$this->assertEqual($siteInfo['name'], $name);
     	
     }
@@ -164,14 +163,14 @@ class Test_Piwik_SitesManager extends Test_Database
     public function test_addSite()
     {
     	$name = "website ";
-    	$idsite = Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/"));
     	$this->assertIsA( $idsite,'int');
     	
-    	$siteInfo = Piwik_SitesManager::getSiteFromId($idsite);
+    	$siteInfo = Piwik_SitesManager_API::getSiteFromId($idsite);
     	$this->assertEqual($siteInfo['name'], $name);
     	$this->assertEqual($siteInfo['main_url'], "http://piwik.net");
     	
-    	$siteUrls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	$this->assertEqual($siteUrls, array("http://piwik.net","http://piwik.com/test"));
     	   	
     	return $idsite;
@@ -184,7 +183,7 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$idsite = $this->test_addSite();
     	
-    	$siteUrlsBefore = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsBefore = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$toAdd = array(	"http://piwik1.net",
 						"http://piwik2.net", 
@@ -202,10 +201,10 @@ class Test_Piwik_SitesManager extends Test_Database
 							"http://l42578gqege.f4", 
 							"http://super.com/test/test/atqata675675/te");
     	
-    	$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    	$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	$this->assertEqual($insertedUrls, count($toAdd));
     	
-    	$siteUrlsAfter = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsAfter = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$shouldHave = array_merge($siteUrlsBefore, $toAddValid);
     	sort($shouldHave);
@@ -222,14 +221,14 @@ class Test_Piwik_SitesManager extends Test_Database
     {    	
     	$idsite = $this->test_addSite();
     	
-    	$siteUrlsBefore = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsBefore = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$toAdd = array_merge($siteUrlsBefore, array("http://piwik1.net","http://piwik2.net"));
     	
-    	$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    	$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	$this->assertEqual($insertedUrls, count($toAdd) - count($siteUrlsBefore));
     	
-    	$siteUrlsAfter = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsAfter = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$shouldHave = $toAdd;
     	sort($shouldHave);
@@ -246,14 +245,14 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$idsite = $this->test_addSite();
     	
-    	$siteUrlsBefore = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsBefore = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$toAdd = array();
     	
-    	$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    	$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	$this->assertEqual($insertedUrls, count($toAdd));
     	
-    	$siteUrlsAfter = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsAfter = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$shouldHave = $siteUrlsBefore;
     	sort($shouldHave);
@@ -270,14 +269,14 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$idsite = $this->test_addSite();
     	
-    	$siteUrlsBefore = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsBefore = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$toAdd = $siteUrlsBefore;
     	
-    	$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    	$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	$this->assertEqual($insertedUrls, 0);
     	
-    	$siteUrlsAfter = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$siteUrlsAfter = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$shouldHave = $siteUrlsBefore;
     	sort($shouldHave);
@@ -298,7 +297,7 @@ class Test_Piwik_SitesManager extends Test_Database
     	$toAdd = array("http://pi''.com");
     	
     	try {
-    		$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    		$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	}
     	catch (Exception $expected) {
             return;
@@ -317,7 +316,7 @@ class Test_Piwik_SitesManager extends Test_Database
     	$toAdd = array("http://pi^.com");
     	
     	try {
-    		$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    		$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	}
     	catch (Exception $expected) {
             return;
@@ -335,7 +334,7 @@ class Test_Piwik_SitesManager extends Test_Database
     	$toAdd = array("http://pigeq.com/test{}");
     	
     	try {
-    		$insertedUrls = Piwik_SitesManager::addSiteAliasUrls($idsite, $toAdd);
+    		$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls($idsite, $toAdd);
     	}
     	catch (Exception $expected) {
             return;
@@ -351,7 +350,7 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$toAdd = array("http://pigeq.com/test");
     	try {
-    		$insertedUrls = Piwik_SitesManager::addSiteAliasUrls(-1, $toAdd);
+    		$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls(-1, $toAdd);
     	}
     	catch (Exception $expected) {
             return;
@@ -367,7 +366,7 @@ class Test_Piwik_SitesManager extends Test_Database
     	$toAdd = array("http://pigeq.com/test");
     	
     	try {
-    		$insertedUrls = Piwik_SitesManager::addSiteAliasUrls(155, $toAdd);
+    		$insertedUrls = Piwik_SitesManager_API::addSiteAliasUrls(155, $toAdd);
     	}
     	catch (Exception $expected) {
             return;
@@ -380,7 +379,7 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_getAllSitesId_noId()
     {
-    	$ids = Piwik_SitesManager::getAllSitesId();
+    	$ids = Piwik_SitesManager_API::getAllSitesId();
     	$this->assertEqual(array(),$ids);
     }
     
@@ -391,14 +390,14 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	$name="tetq";
     	$idsites = array(
-    				Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
-    				Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
-    				Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
-    				Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
-    				Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
+    				Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
+    				Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
+    				Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
+    				Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
+    				Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/")),
     		);
     	
-    	$ids = Piwik_SitesManager::getAllSitesId();
+    	$ids = Piwik_SitesManager_API::getAllSitesId();
     	$this->assertEqual($idsites,$ids);
     }
     
@@ -409,7 +408,7 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	
     	try {
-    		$siteInfo = Piwik_SitesManager::getSiteFromId(0);
+    		$siteInfo = Piwik_SitesManager_API::getSiteFromId(0);
     	}
     	catch (Exception $expected) {
             return;
@@ -424,7 +423,7 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	
     	try {
-    		$siteInfo = Piwik_SitesManager::getSiteFromId("x1");
+    		$siteInfo = Piwik_SitesManager_API::getSiteFromId("x1");
     	}
     	catch (Exception $expected) {
             return;
@@ -437,7 +436,7 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_getSiteFromId_wrongId3()
     {
-    	$idsite = Piwik_SitesManager::addSite("site",array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site",array("http://piwik.net","http://piwik.com/test/"));
     	$this->assertEqual($idsite,1);
     	
     	// set noaccess to site 1
@@ -445,7 +444,7 @@ class Test_Piwik_SitesManager extends Test_Database
 		FakeAccess::setIdSitesAdmin (array());
     	
     	try {
-    		$siteInfo = Piwik_SitesManager::getSiteFromId(1);
+    		$siteInfo = Piwik_SitesManager_API::getSiteFromId(1);
     	}
     	catch (Exception $expected) {
             return;
@@ -459,10 +458,10 @@ class Test_Piwik_SitesManager extends Test_Database
     function test_getSiteFromId_normalId()
     {
     	$name = "website ''";
-    	$idsite = Piwik_SitesManager::addSite($name,array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite($name,array("http://piwik.net","http://piwik.com/test/"));
     	$this->assertIsA( $idsite,'int');
     	
-    	$siteInfo = Piwik_SitesManager::getSiteFromId($idsite);
+    	$siteInfo = Piwik_SitesManager_API::getSiteFromId($idsite);
     	$this->assertEqual($siteInfo['name'], $name);
     	$this->assertEqual($siteInfo['main_url'], "http://piwik.net");
     }
@@ -475,7 +474,7 @@ class Test_Piwik_SitesManager extends Test_Database
     {
 		FakeAccess::setIdSitesAdmin (array());
     	
-    	$sites = Piwik_SitesManager::getSitesWithAdminAccess();
+    	$sites = Piwik_SitesManager_API::getSitesWithAdminAccess();
     	$this->assertEqual($sites, array());
     }
     
@@ -484,9 +483,9 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_getSitesWithAdminAccess()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site2",array("http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site3",array("http://piwik.org"));
+    	$idsite = Piwik_SitesManager_API::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site2",array("http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site3",array("http://piwik.org"));
     	
     	$resultWanted = array(
     		0 => array("idsite" => 1, "name" => "site1", "main_url" =>"http://piwik.net"),
@@ -495,7 +494,7 @@ class Test_Piwik_SitesManager extends Test_Database
     		
 		FakeAccess::setIdSitesAdmin (array(1,3));
 		
-    	$sites = Piwik_SitesManager::getSitesWithAdminAccess();
+    	$sites = Piwik_SitesManager_API::getSitesWithAdminAccess();
     	$this->assertEqual($sites, $resultWanted);
     }
     
@@ -507,7 +506,7 @@ class Test_Piwik_SitesManager extends Test_Database
 		FakeAccess::setIdSitesView (array());
 		FakeAccess::setIdSitesAdmin (array());
     	
-    	$sites = Piwik_SitesManager::getSitesWithViewAccess();
+    	$sites = Piwik_SitesManager_API::getSitesWithViewAccess();
     	$this->assertEqual($sites, array());
     }
     
@@ -516,9 +515,9 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_getSitesWithViewAccess()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site2",array("http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site3",array("http://piwik.org"));
+    	$idsite = Piwik_SitesManager_API::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site2",array("http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site3",array("http://piwik.org"));
     	
     	$resultWanted = array(
     		0 => array("idsite" => 1, "name" => "site1", "main_url" =>"http://piwik.net"),
@@ -528,7 +527,7 @@ class Test_Piwik_SitesManager extends Test_Database
 		FakeAccess::setIdSitesView (array(1,3));
 		FakeAccess::setIdSitesAdmin (array());
     	
-    	$sites = Piwik_SitesManager::getSitesWithViewAccess();
+    	$sites = Piwik_SitesManager_API::getSitesWithViewAccess();
     	$this->assertEqual($sites, $resultWanted);
     }
     
@@ -540,7 +539,7 @@ class Test_Piwik_SitesManager extends Test_Database
 		FakeAccess::setIdSitesView (array());
 		FakeAccess::setIdSitesAdmin (array());
     	
-    	$sites = Piwik_SitesManager::getSitesWithAtLeastViewAccess();
+    	$sites = Piwik_SitesManager_API::getSitesWithAtLeastViewAccess();
     	$this->assertEqual($sites, array());
     }
     
@@ -549,9 +548,9 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_getSitesWithAtLeastViewAccess()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site2",array("http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site3",array("http://piwik.org"));
+    	$idsite = Piwik_SitesManager_API::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site2",array("http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site3",array("http://piwik.org"));
     	
     	$resultWanted = array(
     		0 => array("idsite" => 1, "name" => "site1", "main_url" =>"http://piwik.net"),
@@ -561,7 +560,7 @@ class Test_Piwik_SitesManager extends Test_Database
 		FakeAccess::setIdSitesView (array(1,3));
 		FakeAccess::setIdSitesAdmin (array());
     	
-    	$sites = Piwik_SitesManager::getSitesWithAtLeastViewAccess();
+    	$sites = Piwik_SitesManager_API::getSitesWithAtLeastViewAccess();
     	$this->assertEqual($sites, $resultWanted);
     }
     
@@ -571,9 +570,9 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_getSiteUrlsFromId_noUrls()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1",array("http://piwik.net"));
+    	$idsite = Piwik_SitesManager_API::addSite("site1",array("http://piwik.net"));
     	
-    	$urls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$urls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	$this->assertEqual(array("http://piwik.net"),$urls);
     }
     
@@ -588,14 +587,14 @@ class Test_Piwik_SitesManager extends Test_Database
 						"http://piwik.com");
 		sort($site);
 		
-    	$idsite = Piwik_SitesManager::addSite("site1",$site);
+    	$idsite = Piwik_SitesManager_API::addSite("site1",$site);
     	
 
     	$siteWanted = array("http://piwik.net",
 						"http://piwik.org",	
 						"http://piwik.com");
 		sort($siteWanted);
-    	$urls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$urls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	
     	$this->assertEqual($siteWanted, $urls);
@@ -610,7 +609,7 @@ class Test_Piwik_SitesManager extends Test_Database
 		FakeAccess::setIdSitesAdmin (array());
     	
     	try {
-    		Piwik_SitesManager::getSiteUrlsFromId(1);
+    		Piwik_SitesManager_API::getSiteUrlsFromId(1);
     	}
     	catch (Exception $expected) {
             return;
@@ -627,7 +626,7 @@ class Test_Piwik_SitesManager extends Test_Database
     {
     	
     	try {
-    		Piwik_SitesManager::replaceSiteUrls(-1, array("http://piwik.net"));
+    		Piwik_SitesManager_API::replaceSiteUrls(-1, array("http://piwik.net"));
     	}
     	catch (Exception $expected) {
             return;
@@ -640,9 +639,9 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_replaceSiteUrls_noUrls()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1","http://test.com");
+    	$idsite = Piwik_SitesManager_API::addSite("site1","http://test.com");
     	try {
-    		Piwik_SitesManager::replaceSiteUrls($idsite, array());
+    		Piwik_SitesManager_API::replaceSiteUrls($idsite, array());
 	        $this->fail("Exception not raised.");
     	}
     	catch (Exception $expected) {
@@ -655,11 +654,11 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_replaceSiteUrls_oneUrls()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1","http://test.com");
+    	$idsite = Piwik_SitesManager_API::addSite("site1","http://test.com");
     	$this->assertEqual(
-    				Piwik_SitesManager::replaceSiteUrls($idsite, array("http://piwiknew.com")),
+    				Piwik_SitesManager_API::replaceSiteUrls($idsite, array("http://piwiknew.com")),
     				1);
-    	$site = Piwik_SitesManager::getSiteFromId($idsite);
+    	$site = Piwik_SitesManager_API::getSiteFromId($idsite);
     	$this->assertEqual($site['main_url'], "http://piwiknew.com");
     }
     
@@ -672,13 +671,13 @@ class Test_Piwik_SitesManager extends Test_Database
 						"http://piwiknew.net",
 						"http://piwiknew.org",
 						"http://piwiknew.fr");
-    	$idsite = Piwik_SitesManager::addSite("site1","http://test.com");
+    	$idsite = Piwik_SitesManager_API::addSite("site1","http://test.com");
     	$this->assertEqual(
-    				Piwik_SitesManager::replaceSiteUrls($idsite, 
+    				Piwik_SitesManager_API::replaceSiteUrls($idsite, 
     							$urls),
     				4);
 
-    	$all = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$all = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	$this->assertEqual($all[0], $urls[0]);
     	sort($all);
     	sort($urls);
@@ -696,12 +695,12 @@ class Test_Piwik_SitesManager extends Test_Database
 						"http://piwiknew.net",
 						"http://piwiknew.org",
 						"http://piwiknew.fr");
-    	$idsite = Piwik_SitesManager::addSite("site1",$urls);
+    	$idsite = Piwik_SitesManager_API::addSite("site1",$urls);
     	
     	$newMainUrl = "http://main.url";
-    	Piwik_SitesManager::updateSite($idsite, "test toto@{}",$newMainUrl );
+    	Piwik_SitesManager_API::updateSite($idsite, "test toto@{}",$newMainUrl );
     	
-    	$allUrls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$allUrls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	
     	$this->assertEqual($allUrls[0], $newMainUrl);
     	$a1 = array_slice($allUrls,1); sort($a1);
@@ -714,12 +713,12 @@ class Test_Piwik_SitesManager extends Test_Database
      */
     function test_updateSite_strangeNameNoUrl()
     {
-    	$idsite = Piwik_SitesManager::addSite("site1","http://main.url");
+    	$idsite = Piwik_SitesManager_API::addSite("site1","http://main.url");
     	$newName ="test toto@{'786'}";
     	
-    	Piwik_SitesManager::updateSite($idsite, $newName );
+    	Piwik_SitesManager_API::updateSite($idsite, $newName );
     	
-    	$site = Piwik_SitesManager::getSiteFromId($idsite);
+    	$site = Piwik_SitesManager_API::getSiteFromId($idsite);
     	
     	$this->assertEqual($site['name'],$newName);
     	// url didn't change because parameter url NULL in updateSite
@@ -738,15 +737,15 @@ class Test_Piwik_SitesManager extends Test_Database
 						"http://piwiknew.net",
 						"http://piwiknew.org",
 						"http://piwiknew.fr");
-    	$idsite = Piwik_SitesManager::addSite("site1",$urls);
+    	$idsite = Piwik_SitesManager_API::addSite("site1",$urls);
     	
     	$newurls = array("http://piwiknew2.com",
 						"http://piwiknew2.net",
 						"http://piwiknew2.org",
 						"http://piwiknew2.fr");
-    	Piwik_SitesManager::updateSite($idsite, "test toto@{}",$newurls );
+    	Piwik_SitesManager_API::updateSite($idsite, "test toto@{}",$newurls );
     	
-    	$allUrls = Piwik_SitesManager::getSiteUrlsFromId($idsite);
+    	$allUrls = Piwik_SitesManager_API::getSiteUrlsFromId($idsite);
     	sort($allUrls);
     	sort($newurls);
     	
diff --git a/tests/modules/UsersManager.test.php b/tests/modules/UsersManager.test.php
index 67acc70c13..09871614de 100644
--- a/tests/modules/UsersManager.test.php
+++ b/tests/modules/UsersManager.test.php
@@ -9,7 +9,7 @@ if(!defined('CONFIG_TEST_INCLUDED'))
 require_once "Database.test.php";
 
 
-Zend_Loader::loadClass('Piwik_UsersManager');
+require 'UsersManager.php';
 
 class Test_Piwik_UsersManager extends Test_Database
 {
@@ -38,7 +38,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongLogin1()
     {
     	try {
-    		Piwik_UsersManager::addUser(12, "password", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser(12, "password", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertNoPattern("(already exist)", $expected->getMessage());
@@ -54,7 +54,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongLogin2()
     {
     	try {
-    		Piwik_UsersManager::addUser("gegag'ggea'", "password", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("gegag'ggea'", "password", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertNoPattern("(already exist)", $expected->getMessage());
@@ -69,7 +69,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongLogin3()
     {
     	try {
-    		Piwik_UsersManager::addUser("gegag11gge@", "password", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("gegag11gge@", "password", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertNoPattern("(already exist)", $expected->getMessage());
@@ -85,7 +85,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongLogin4()
     {
     	try {
-    		Piwik_UsersManager::addUser("geg'ag11gge@", "password", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("geg'ag11gge@", "password", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertNoPattern("(already exist)", $expected->getMessage());
@@ -101,8 +101,8 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_existingLogin()
     {
     	try {
-    		Piwik_UsersManager::addUser("test", "password", "email@email.com", "alias");
-    		Piwik_UsersManager::addUser("test", "password2", "em2ail@email.com", "al2ias");
+    		Piwik_UsersManager_API::addUser("test", "password", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("test", "password2", "em2ail@email.com", "al2ias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(already exist)", $expected->getMessage());
@@ -118,7 +118,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongPassword1()
     {
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "pas", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "pas", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(password)", $expected->getMessage());
@@ -132,7 +132,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongPassword2()
     {
     	try {
-    		Piwik_UsersManager::addUser("ghqgeggg", "gegageqqqqqqqgeqgqeg84897897897897g122", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("ghqgeggg", "gegageqqqqqqqgeqgqeg84897897897897g122", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(password)", $expected->getMessage());
@@ -147,7 +147,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongPassword3()
     {
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "", "email@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "", "email@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(password)", $expected->getMessage());
@@ -161,7 +161,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongEmail1()
     {
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "ema'il@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "ema'il@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(mail)", $expected->getMessage());
@@ -176,7 +176,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongEmail2()
     {
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "@email.com", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "@email.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(mail)", $expected->getMessage());
@@ -190,7 +190,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongEmail3()
     {
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "email@.com", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "email@.com", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(mail)", $expected->getMessage());
@@ -205,7 +205,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_wrongEmail4()
     {
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "email@4.", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "email@4.", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(mail)", $expected->getMessage());
@@ -221,7 +221,7 @@ class Test_Piwik_UsersManager extends Test_Database
     {
     	
     	try {
-    		Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "", "alias");
+    		Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "", "alias");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(mail)", $expected->getMessage());
@@ -236,8 +236,8 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_emptyAlias()
     {
     	$login ="geggeqgeqag";
-		Piwik_UsersManager::addUser($login, "geqgeagae", "mgeagi@geq.com", "");
-    	$user = Piwik_UsersManager::getUser($login);
+		Piwik_UsersManager_API::addUser($login, "geqgeagae", "mgeagi@geq.com", "");
+    	$user = Piwik_UsersManager_API::getUser($login);
     	$this->assertEqual($user['alias'], $login);
     	$this->assertEqual($user['login'], $login);
     	
@@ -248,8 +248,8 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_addUser_noAliasSpecified()
     {
     	$login ="geggeqg455eqag";
-		Piwik_UsersManager::addUser($login, "geqgeagae", "mgeagi@geq.com");
-    	$user = Piwik_UsersManager::getUser($login);
+		Piwik_UsersManager_API::addUser($login, "geqgeagae", "mgeagi@geq.com");
+    	$user = Piwik_UsersManager_API::getUser($login);
     	$this->assertEqual($user['alias'], $login);
     	$this->assertEqual($user['login'], $login);
     	
@@ -266,8 +266,8 @@ class Test_Piwik_UsersManager extends Test_Database
     	$email = "mgeag4544i@geq.com";
     	$alias = "her is my alias )(&|\" '£%*(&%+))";
 		
-		Piwik_UsersManager::addUser($login, $password, $email, $alias);
-    	$user = Piwik_UsersManager::getUser($login);
+		Piwik_UsersManager_API::addUser($login, $password, $email, $alias);
+    	$user = Piwik_UsersManager_API::getUser($login);
 		
 	    // check that the date registered is correct
 		$this->assertTrue( strtotime($user['date_registered']) >= time() - 1 , 
@@ -293,10 +293,10 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_deleteUser_doesntExist()
     {	
-		Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
+		Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
 		
     	try {
-			Piwik_UsersManager::deleteUser("geggeqggnew");
+			Piwik_UsersManager_API::deleteUser("geggeqggnew");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(doesn't exist)", $expected->getMessage());
@@ -311,7 +311,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_deleteUser_emptyUser()
     {
     	try {
-			Piwik_UsersManager::deleteUser("");
+			Piwik_UsersManager_API::deleteUser("");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(doesn't exist)", $expected->getMessage());
@@ -326,7 +326,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_deleteUser_nullUser()
     {
     	try {
-			Piwik_UsersManager::deleteUser(null);
+			Piwik_UsersManager_API::deleteUser(null);
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(doesn't exist)", $expected->getMessage());
@@ -342,35 +342,35 @@ class Test_Piwik_UsersManager extends Test_Database
     {
     	
     	//create the 3 websites
-    	$idsite = Piwik_SitesManager::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site2",array("http://piwik.com/test/"));
-    	$idsite = Piwik_SitesManager::addSite("site3",array("http://piwik.org"));
+    	$idsite = Piwik_SitesManager_API::addSite("site1",array("http://piwik.net","http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site2",array("http://piwik.com/test/"));
+    	$idsite = Piwik_SitesManager_API::addSite("site3",array("http://piwik.org"));
     	
     	//add user and set some rights
-    	Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
-    	Piwik_UsersManager::setUserAccess("geggeqgeqag", "view", array(1,2));
-    	Piwik_UsersManager::setUserAccess("geggeqgeqag", "admin", array(1,3));
+    	Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
+    	Piwik_UsersManager_API::setUserAccess("geggeqgeqag", "view", array(1,2));
+    	Piwik_UsersManager_API::setUserAccess("geggeqgeqag", "admin", array(1,3));
 		
 		// check rights are set
-		$this->assertNotEqual(Piwik_UsersManager::getSitesAccessFromUser("geggeqgeqag"), array());
+		$this->assertNotEqual(Piwik_UsersManager_API::getSitesAccessFromUser("geggeqgeqag"), array());
 		
 		// delete the user
-		Piwik_UsersManager::deleteUser("geggeqgeqag");
+		Piwik_UsersManager_API::deleteUser("geggeqgeqag");
 		
 		// try to get it, it should raise an exception
 		try {
-    		$user = Piwik_UsersManager::getUser("geggeqgeqag");
+    		$user = Piwik_UsersManager_API::getUser("geggeqgeqag");
 	        $this->fail("Exception not raised.");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(doesn't exist)", $expected->getMessage());
         }
         // add the same user
-        Piwik_UsersManager::addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
+        Piwik_UsersManager_API::addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
 		
 		//checks access have been deleted
 		//to do so we recreate the same user login and check if the rights are still there
-		$this->assertEqual(Piwik_UsersManager::getSitesAccessFromUser("geggeqgeqag"), array());
+		$this->assertEqual(Piwik_UsersManager_API::getSitesAccessFromUser("geggeqgeqag"), array());
     
     }
     
@@ -382,7 +382,7 @@ class Test_Piwik_UsersManager extends Test_Database
     {
     	// try to get it, it should raise an exception
 		try {
-    		$user = Piwik_UsersManager::getUser("geggeqgeqag");
+    		$user = Piwik_UsersManager_API::getUser("geggeqgeqag");
 	        $this->fail("Exception not raised.");
     	}
     	catch (Exception $expected) {
@@ -400,8 +400,8 @@ class Test_Piwik_UsersManager extends Test_Database
     	$email = "mgeag4544i@geq.com";
     	$alias = "";
 		
-		Piwik_UsersManager::addUser($login, $password, $email, $alias);
-    	$user = Piwik_UsersManager::getUser($login);
+		Piwik_UsersManager_API::addUser($login, $password, $email, $alias);
+    	$user = Piwik_UsersManager_API::getUser($login);
 						
 	    // check that all fields are the same
 		$this->assertEqual($user['login'], $login);
@@ -419,7 +419,7 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_getUsers_noUser()
     {
-    	$this->assertEqual(Piwik_UsersManager::getUsers(), array());
+    	$this->assertEqual(Piwik_UsersManager_API::getUsers(), array());
     }
     
     /**
@@ -428,12 +428,12 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_getUsers()
     {
     	
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-    	Piwik_UsersManager::addUser("geggeqge632ge56a4qag", "geqgegeagae", "tesggt@tesgt.com", "alias");
-    	Piwik_UsersManager::addUser("geggeqgeqagqegg", "geqgeaggggae", "tesgggt@tesgt.com");
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("geggeqge632ge56a4qag", "geqgegeagae", "tesggt@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("geggeqgeqagqegg", "geqgeaggggae", "tesgggt@tesgt.com");
     	
     	   	
-    	$this->assertEqual(Piwik_UsersManager::getUsers(), array("gegg4564eqgeqag",
+    	$this->assertEqual(Piwik_UsersManager_API::getUsers(), array("gegg4564eqgeqag",
     														"geggeqge632ge56a4qag",
     														"geggeqgeqagqegg"));
     	
@@ -447,7 +447,7 @@ class Test_Piwik_UsersManager extends Test_Database
     {
     	// try to get it, it should raise an exception
 		try {
-    		Piwik_UsersManager::setUserAccess("nologin", "view");
+    		Piwik_UsersManager_API::setUserAccess("nologin", "view");
 	        $this->fail("Exception not raised.");
     	}
     	catch (Exception $expected) {
@@ -461,11 +461,11 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_wrongAccess()
     {
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
     	
     	// try to get it, it should raise an exception
 		try {
-    		Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "viewnotknown");
+    		Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "viewnotknown");
 	        $this->fail("Exception not raised.");
     	}
     	catch (Exception $expected) {
@@ -478,14 +478,14 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_idsitesNull()
     {
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
     	
     	FakeAccess::$superUser = false;
     	
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "view");
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "view");
     	
     	FakeAccess::$superUser = true;
-    	$access = Piwik_UsersManager::getSitesAccessFromUser("gegg4564eqgeqag");
+    	$access = Piwik_UsersManager_API::getSitesAccessFromUser("gegg4564eqgeqag");
     	
     	FakeAccess::$superUser = false;
     	$this->assertEqual( array_keys($access), FakeAccess::getSitesIdWithAdminAccess());
@@ -503,17 +503,17 @@ class Test_Piwik_UsersManager extends Test_Database
     {
     	FakeAccess::$superUser = true;
     	
-    	$id1=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
-		$id2=Piwik_SitesManager::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
-    	$id3=Piwik_SitesManager::addSite("test3",array("http://piwik.net","http://piwik.com/test/"));
-    	$id4=Piwik_SitesManager::addSite("test4",array("http://piwik.net","http://piwik.com/test/"));
-    	$id5=Piwik_SitesManager::addSite("test5",array("http://piwik.net","http://piwik.com/test/"));
+    	$id1=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+		$id2=Piwik_SitesManager_API::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
+    	$id3=Piwik_SitesManager_API::addSite("test3",array("http://piwik.net","http://piwik.com/test/"));
+    	$id4=Piwik_SitesManager_API::addSite("test4",array("http://piwik.net","http://piwik.com/test/"));
+    	$id5=Piwik_SitesManager_API::addSite("test5",array("http://piwik.net","http://piwik.com/test/"));
     	
-		Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+		Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
     	
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "view");
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "view");
     	
-    	$access = Piwik_UsersManager::getSitesAccessFromUser("gegg4564eqgeqag");
+    	$access = Piwik_UsersManager_API::getSitesAccessFromUser("gegg4564eqgeqag");
     	$this->assertEqual( array($id1,$id2,$id3,$id4,$id5), array_keys($access));
     	
     }
@@ -523,11 +523,11 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_idsitesEmpty()
     {
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
     	
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "view", array());
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "view", array());
     	
-    	$access = Piwik_UsersManager::getSitesAccessFromUser("gegg4564eqgeqag");
+    	$access = Piwik_UsersManager_API::getSitesAccessFromUser("gegg4564eqgeqag");
     	$this->assertEqual( array(), $access);
     	
     }
@@ -537,12 +537,12 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_idsitesOneSite()
     {
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-    	$id1=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	$id1=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
 		
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "view", array(1));
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "view", array(1));
     	
-    	$access = Piwik_UsersManager::getSitesAccessFromUser("gegg4564eqgeqag");
+    	$access = Piwik_UsersManager_API::getSitesAccessFromUser("gegg4564eqgeqag");
     	$this->assertEqual( array(1), array_keys($access));
     }
     
@@ -552,14 +552,14 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_setUserAccess_idsitesMultipleSites()
     {
     	
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-    	$id1=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
-		$id2=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
-		$id3=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	$id1=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+		$id2=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+		$id3=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
 		
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "view", array($id1,$id3));
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "view", array($id1,$id3));
     	
-    	$access = Piwik_UsersManager::getSitesAccessFromUser("gegg4564eqgeqag");
+    	$access = Piwik_UsersManager_API::getSitesAccessFromUser("gegg4564eqgeqag");
     	$this->assertEqual( array($id1,$id3), array_keys($access));
     }
     
@@ -569,14 +569,14 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_multipleCallDistinctAccessSameUser()
     {
-    	Piwik_UsersManager::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-    	$id1=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
-		$id2=Piwik_SitesManager::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+    	Piwik_UsersManager_API::addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
+    	$id1=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
+		$id2=Piwik_SitesManager_API::addSite("test",array("http://piwik.net","http://piwik.com/test/"));
 		
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "view", array($id1));
-    	Piwik_UsersManager::setUserAccess("gegg4564eqgeqag", "admin", array($id2));
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "view", array($id1));
+    	Piwik_UsersManager_API::setUserAccess("gegg4564eqgeqag", "admin", array($id2));
     	
-    	$access = Piwik_UsersManager::getSitesAccessFromUser("gegg4564eqgeqag");
+    	$access = Piwik_UsersManager_API::getSitesAccessFromUser("gegg4564eqgeqag");
     	$this->assertEqual( array($id1=>'view',$id2=>'admin'), $access);
     }
     
@@ -585,18 +585,18 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_multipleCallDistinctAccessMultipleUser()
     {
-    	Piwik_UsersManager::addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
-    	Piwik_UsersManager::addUser("user2", "geqgegagae", "tegst@tesgt.com", "alias");
-    	$id1=Piwik_SitesManager::addSite("test1",array("http://piwik.net","http://piwik.com/test/"));
-		$id2=Piwik_SitesManager::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
-		$id3=Piwik_SitesManager::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
+    	Piwik_UsersManager_API::addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("user2", "geqgegagae", "tegst@tesgt.com", "alias");
+    	$id1=Piwik_SitesManager_API::addSite("test1",array("http://piwik.net","http://piwik.com/test/"));
+		$id2=Piwik_SitesManager_API::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
+		$id3=Piwik_SitesManager_API::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
 		
-    	Piwik_UsersManager::setUserAccess("user1", "view", array($id1,$id2));
-    	Piwik_UsersManager::setUserAccess("user2", "admin", array($id1));
-    	Piwik_UsersManager::setUserAccess("user2", "view", array($id3));
+    	Piwik_UsersManager_API::setUserAccess("user1", "view", array($id1,$id2));
+    	Piwik_UsersManager_API::setUserAccess("user2", "admin", array($id1));
+    	Piwik_UsersManager_API::setUserAccess("user2", "view", array($id3));
     	
-    	$access1 = Piwik_UsersManager::getSitesAccessFromUser("user1");
-    	$access2 = Piwik_UsersManager::getSitesAccessFromUser("user2");
+    	$access1 = Piwik_UsersManager_API::getSitesAccessFromUser("user1");
+    	$access2 = Piwik_UsersManager_API::getSitesAccessFromUser("user2");
     	$wanted1 = array( $id1 => 'view', $id2 => 'view', );
     	$wanted2 = array( $id1 => 'admin', $id3 => 'view' );
     	
@@ -604,9 +604,9 @@ class Test_Piwik_UsersManager extends Test_Database
     	$this->assertEqual($access2, $wanted2);
     	
     	
-    	$access1 = Piwik_UsersManager::getUsersAccessFromSite($id1);
-    	$access2 = Piwik_UsersManager::getUsersAccessFromSite($id2);
-    	$access3 = Piwik_UsersManager::getUsersAccessFromSite($id3);
+    	$access1 = Piwik_UsersManager_API::getUsersAccessFromSite($id1);
+    	$access2 = Piwik_UsersManager_API::getUsersAccessFromSite($id2);
+    	$access3 = Piwik_UsersManager_API::getUsersAccessFromSite($id3);
     	$wanted1 = array( 'user1' => 'view', 'user2' => 'admin', );
     	$wanted2 = array( 'user1' => 'view' );
     	$wanted3 = array( 'user2' => 'view' );
@@ -615,8 +615,8 @@ class Test_Piwik_UsersManager extends Test_Database
     	$this->assertEqual($access2, $wanted2);
     	$this->assertEqual($access3, $wanted3);
     	
-    	$access1 = Piwik_UsersManager::getUsersSitesFromAccess('view');
-    	$access2 = Piwik_UsersManager::getUsersSitesFromAccess('admin');
+    	$access1 = Piwik_UsersManager_API::getUsersSitesFromAccess('view');
+    	$access2 = Piwik_UsersManager_API::getUsersSitesFromAccess('admin');
     	$wanted1 = array( 'user1' => array($id1,$id2), 'user2' => array($id3) );
     	$wanted2 = array( 'user2' => array($id1) );
     	
@@ -630,15 +630,15 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_setUserAccess_multipleCallOverwriteSingleUserOneSite()
     {
-    	Piwik_UsersManager::addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
+    	Piwik_UsersManager_API::addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
     	
-    	$id1=Piwik_SitesManager::addSite("test1",array("http://piwik.net","http://piwik.com/test/"));
-		$id2=Piwik_SitesManager::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
+    	$id1=Piwik_SitesManager_API::addSite("test1",array("http://piwik.net","http://piwik.com/test/"));
+		$id2=Piwik_SitesManager_API::addSite("test2",array("http://piwik.net","http://piwik.com/test/"));
 		
-    	Piwik_UsersManager::setUserAccess("user1", "view", array($id1,$id2));
-    	Piwik_UsersManager::setUserAccess("user1", "admin", array($id1));
+    	Piwik_UsersManager_API::setUserAccess("user1", "view", array($id1,$id2));
+    	Piwik_UsersManager_API::setUserAccess("user1", "admin", array($id1));
     	
-    	$access1 = Piwik_UsersManager::getSitesAccessFromUser("user1");
+    	$access1 = Piwik_UsersManager_API::getSitesAccessFromUser("user1");
     	$wanted1 = array( $id1 => 'admin', $id2 => 'view', );
     	
     	$this->assertEqual($access1, $wanted1);
@@ -652,7 +652,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_getSitesAccessFromUser_wrongUser()
     {
     	try {
-    		$access1 = Piwik_UsersManager::getSitesAccessFromUser("user1");
+    		$access1 = Piwik_UsersManager_API::getSitesAccessFromUser("user1");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(user)", $expected->getMessage());
@@ -667,7 +667,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_getUsersAccessFromSite_wrongSite()
     {
     	try {
-    		$access1 = Piwik_UsersManager::getUsersAccessFromSite(1);
+    		$access1 = Piwik_UsersManager_API::getUsersAccessFromSite(1);
     	}
     	catch (Exception $expected) {
             return;
@@ -680,9 +680,8 @@ class Test_Piwik_UsersManager extends Test_Database
      */
     function test_getUsersSitesFromAccess_wrongSite()
     {
-    	
     	try {
-    		$access1 = Piwik_UsersManager::getUsersSitesFromAccess('unknown');
+    		$access1 = Piwik_UsersManager_API::getUsersSitesFromAccess('unknown');
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(access)", $expected->getMessage());
@@ -698,7 +697,7 @@ class Test_Piwik_UsersManager extends Test_Database
     function test_updateUser_wrongLogin()
     {
     	try {
-    		Piwik_UsersManager::updateUser(  "lolgin", "password");
+    		Piwik_UsersManager_API::updateUser(  "lolgin", "password");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(doesn't exist)", $expected->getMessage());
@@ -718,11 +717,11 @@ class Test_Piwik_UsersManager extends Test_Database
     					'email'=>"test@test.com",
     					'alias'=>"alias");
     					
-    	Piwik_UsersManager::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
+    	Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
 		
 		
     	try {
-    		Piwik_UsersManager::updateUser(  $login, "pas");
+    		Piwik_UsersManager_API::updateUser(  $login, "pas");
     	}
     	catch (Exception $expected) {
     		$this->assertPattern("(password)", $expected->getMessage());
@@ -743,7 +742,7 @@ class Test_Piwik_UsersManager extends Test_Database
     	{
     		$newAlias = $user['alias'];
     	}
-    	$userAfter = Piwik_UsersManager::getUser($user["login"]);
+    	$userAfter = Piwik_UsersManager_API::getUser($user["login"]);
     	unset($userAfter['date_registered']);
     	$user['token_auth']=md5($user["login"] . $newPassword );
     	
@@ -764,9 +763,9 @@ class Test_Piwik_UsersManager extends Test_Database
     					'email'=>"test@test.com",
     					'alias'=>"alias");
     					
-    	Piwik_UsersManager::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
+    	Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
 		
-    	Piwik_UsersManager::updateUser(  $login, "passowordOK");
+    	Piwik_UsersManager_API::updateUser(  $login, "passowordOK");
     	
     	$this->_checkUserHasNotChanged($user, "passowordOK");
     }
@@ -783,9 +782,9 @@ class Test_Piwik_UsersManager extends Test_Database
     					'email'=>"test@test.com",
     					'alias'=>"alias");
     					
-    	Piwik_UsersManager::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
+    	Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
 		
-    	Piwik_UsersManager::updateUser(  $login, "passowordOK", null, "newalias");
+    	Piwik_UsersManager_API::updateUser(  $login, "passowordOK", null, "newalias");
     	
     	$this->_checkUserHasNotChanged($user, "passowordOK", null, "newalias");
     }
@@ -802,9 +801,9 @@ class Test_Piwik_UsersManager extends Test_Database
     					'email'=>"test@test.com",
     					'alias'=>"alias");
     					
-    	Piwik_UsersManager::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
+    	Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
 		
-    	Piwik_UsersManager::updateUser(  $login, "passowordOK", "email@geaga.com");
+    	Piwik_UsersManager_API::updateUser(  $login, "passowordOK", "email@geaga.com");
     	
     	$this->_checkUserHasNotChanged($user, "passowordOK", "email@geaga.com");
     }
@@ -847,9 +846,9 @@ class Test_Piwik_UsersManager extends Test_Database
     					'email'=>"test@test.com",
     					'alias'=>"alias");
     					
-    	Piwik_UsersManager::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
+    	Piwik_UsersManager_API::addUser($user['login'],$user['password'] ,$user['email'] ,$user['alias'] );
 		
-    	Piwik_UsersManager::updateUser(  $login, "passowordOK", "email@geaga.com", "NEW ALIAS");
+    	Piwik_UsersManager_API::updateUser(  $login, "passowordOK", "email@geaga.com", "NEW ALIAS");
     	
     	$this->_checkUserHasNotChanged($user, "passowordOK", "email@geaga.com", "NEW ALIAS");
     }