diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php
index a2919498e..91db6ac04 100644
--- a/src/PocketMinecraftServer.php
+++ b/src/PocketMinecraftServer.php
@@ -26,7 +26,9 @@ class PocketMinecraftServer{
 	
 	private function load(){
 		$this->version = new VersionString();
-		@cli_set_process_title("PocketMine-MP ".MAJOR_VERSION);
+		if(!defined("DEBUG") or DEBUG >= 0){
+			@cli_set_process_title("PocketMine-MP ".MAJOR_VERSION);
+		}
 		if($this->version->isDev()){
 			console("[INFO] \x1b[31;1mThis is a Development version");
 		}
@@ -87,7 +89,7 @@ class PocketMinecraftServer{
 	
 	public function titleTick(){
 		$time = microtime(true);
-		if(ENABLE_ANSI === true){
+		if((!defined("DEBUG") or DEBUG >= 0) and ENABLE_ANSI === true){
 			echo "\x1b]0;PocketMine-MP ".MAJOR_VERSION." | Online ". count($this->clients)."/".$this->maxClients." | RAM ".round((memory_get_usage() / 1024) / 1024, 2)."MB | U ".round(($this->interface->bandwidth[1] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2)." D ".round(($this->interface->bandwidth[0] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2)." kB/s | TPS ".$this->getTPS()."\x07";
 		}
 		$this->interface->bandwidth = array(0, 0, $time);
diff --git a/src/tests/ServerSuiteTest.php b/src/tests/ServerSuiteTest.php
index fde37c16d..77bc49895 100644
--- a/src/tests/ServerSuiteTest.php
+++ b/src/tests/ServerSuiteTest.php
@@ -1,40 +1,35 @@
 <?php
 /***REM_START***/
-	if(class_exists("PocketMinecraftServer", false)){
-		return;
-	}
-
-	class ServerSuiteTest extends PHPUnit_Framework_TestCase{
-		private $server;
-		public function hook(){
-			$this->assertTrue(true);
-			$server = ServerAPI::request();
+	if(!class_exists("PocketMinecraftServer", false)){
+		class ServerSuiteTest extends PHPUnit_Framework_TestCase{
+			private $server;
+			public function testStart(){
+				define("NO_THREADS", true);
+				define("DEBUG", -1); //No output
+				require_once(dirname(__FILE__)."/../dependencies.php");
+				require_once(FILE_PATH."/src/functions.php");
+				require_once(FILE_PATH."/src/dependencies.php");
 			
+				//binary things
+				$this->assertTrue(Utils::readTriad("\x02\x01\x03") === 131331, "Utils::readTriad");
+				$this->assertTrue(Utils::readInt("\xff\x02\x01\x03") === -16645885, "Utils::readInt");
+				$this->assertTrue(abs(Utils::readFloat("\x49\x02\x01\x03") - 532496.1875) < 0.0001, "Utils::readFloat");
+				$this->assertTrue(abs(Utils::readDouble("\x41\x02\x03\x04\x05\x06\x07\x08") - 147552.5024529) < 0.0001, "Utils::readDouble");
+				$this->assertTrue(Utils::readLong("\x41\x02\x03\x04\x05\x06\x07\x08") === "4684309878217770760", "Utils::readLong");	
+				
+				//PocketMine-MP server startup
+				$server = new ServerAPI();
+				$server->load();
+				$this->assertTrue(is_integer($server->event("server.start", array($this, "hook"))));
+				$server->init();
+			}
 			
-			//Everything done!
-			$server->close();
-		}
-
-		public function testRead(){
-			define("NO_THREADS", true);
-			define("DEBUG", -1); //No output
-			require_once(dirname(__FILE__)."/../dependencies.php");
-			require_once(FILE_PATH."/src/functions.php");
-			require_once(FILE_PATH."/src/dependencies.php");
-		
-			//binary things
-			$this->assertTrue(Utils::readTriad("\x02\x01\x03") === 131331, "Utils::readTriad");
-			$this->assertTrue(Utils::readInt("\xff\x02\x01\x03") === -16645885, "Utils::readInt");
-			$this->assertTrue(abs(Utils::readFloat("\x49\x02\x01\x03") - 532496.1875) < 0.0001, "Utils::readFloat");
-			$this->assertTrue(abs(Utils::readDouble("\x41\x02\x03\x04\x05\x06\x07\x08") - 147552.5024529) < 0.0001, "Utils::readDouble");
-			$this->assertTrue(Utils::readLong("\x41\x02\x03\x04\x05\x06\x07\x08") === "4684309878217770760", "Utils::readLong");	
-			
-			//PocketMine-MP server startup
-			$this->server = new ServerAPI();
-			$this->server->load();
-			$this->assertTrue(is_integer($this->server->event("server.start", array($this, "hook"))));
-			$this->server->init();
-			exit(0);
+			public function hook(){
+				$this->server = ServerAPI::request();			
+				
+				//Everything done!
+				$this->server->close();
+			}
 		}
 	}
 /***REM_END***/
\ No newline at end of file