diff --git a/controller/utilscontroller.php b/controller/utilscontroller.php
index ec5338a..f00102c 100644
--- a/controller/utilscontroller.php
+++ b/controller/utilscontroller.php
@@ -209,7 +209,8 @@ class UtilsController extends Controller {
         // first we check it does not already exist
         $sqlts = 'SELECT servername FROM *PREFIX*gpxedit_tile_servers ';
         $sqlts .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'=\''.$this->userId.'\' ';
-        $sqlts .= 'AND servername='.$this->db_quote_escape_string($servername).' AND type='.$this->db_quote_escape_string($type).' ';
+        $sqlts .= 'AND servername='.$this->db_quote_escape_string($servername).' ';
+        $sqlts .= 'AND type='.$this->db_quote_escape_string($type).' ';
         $req = $this->dbconnection->prepare($sqlts);
         $req->execute();
         $ts = null;
diff --git a/tests/.bootstrap.php.swp b/tests/.bootstrap.php.swp
index 1c3361c..0480769 100644
Binary files a/tests/.bootstrap.php.swp and b/tests/.bootstrap.php.swp differ
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 113fa60..709a17e 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -19,8 +19,8 @@ if (version_compare(implode('.', \OCP\Util::getVersion()), '8.2', '>=')) {
 	\OC_App::loadApp('gpxedit');
 }
 
-if(!class_exists('PHPUnit_Framework_TestCase')) {
-	require_once('PHPUnit/Autoload.php');
-}
+//if(!class_exists('PHPUnit_Framework_TestCase')) {
+//	require_once('PHPUnit/Autoload.php');
+//}
 
 OC_Hook::clear();
diff --git a/tests/php/controller/.pageControllerTest.php.swp b/tests/php/controller/.pageControllerTest.php.swp
index d894ece..9cc0f4e 100644
Binary files a/tests/php/controller/.pageControllerTest.php.swp and b/tests/php/controller/.pageControllerTest.php.swp differ
diff --git a/tests/php/controller/pageControllerTest.php b/tests/php/controller/pageControllerTest.php
index 94b59a9..aea91ad 100644
--- a/tests/php/controller/pageControllerTest.php
+++ b/tests/php/controller/pageControllerTest.php
@@ -19,7 +19,8 @@ namespace OCA\GpxEdit\Controller;
 
 use \OCA\GpxEdit\AppInfo\Application;
 
-class PageControllerTest extends \PHPUnit_Framework_TestCase {
+//class PageControllerTest extends \PHPUnit_Framework_TestCase {
+class PageControllerTest extends \PHPUnit\Framework\TestCase {
 
 	private $appName;
 	private $request;
@@ -44,14 +45,14 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
         $c = $this->container;
 
         // CREATE DUMMY USERS
-        $c->getServer()->getUserManager()->createUser('test', 'T0T0T0');
-        $c->getServer()->getUserManager()->createUser('test2', 'T0T0T0');
+        $c->getServer()->getUserManager()->createUser('testUser', 'T0T0T0');
+        $c->getServer()->getUserManager()->createUser('testUser2', 'T0T0T0');
 
         $this->controller = new UtilsController(
             $this->appName,
             $this->request,
             'test',
-            $c->query('ServerContainer')->getUserFolder($c->query('UserId')),
+            $c->query('ServerContainer')->getUserFolder('testUser'),
             $c->query('ServerContainer')->getConfig(),
             //$c->getServer()->getShareManager(),
             $c->getServer()->getAppManager()
@@ -59,14 +60,14 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function tearDown() {
-        $user = $this->container->getServer()->getUserManager()->get('test');
+        $user = $this->container->getServer()->getUserManager()->get('testUser');
         $user->delete();
-        $user = $this->container->getServer()->getUserManager()->get('test2');
+        $user = $this->container->getServer()->getUserManager()->get('testUser2');
         $user->delete();
     }
 
 	public function testSession() {
-        $resp = $this->controller->addTileServer('plop', 'http://plop.org', 'type',
+        $resp = $this->controller->addTileServer('superserver', 'http://plop.org', 'type',
                     'layers', 'version', 'tformat', '0.5', 'true',
                     '13', '16', 'attr');