diff --git a/test/all.php b/test/all.php
index 1c12ea8..c170fc2 100644
--- a/test/all.php
+++ b/test/all.php
@@ -3,7 +3,7 @@
 
 class AllTests extends TestSuite {
 	function __construct() {
-		$this->TestSuite('all tests');
+		$this->label = 'all tests';
 		$this->collect(__DIR__.'/unit', new SimpleCollector());
 	}
 }
diff --git a/test/remote.php b/test/remote.php
index 1bc1c04..d1befe5 100644
--- a/test/remote.php
+++ b/test/remote.php
@@ -2,9 +2,12 @@
 require_once 'test_helper.php';
 
 class RemoteTests extends TestSuite {
+       
+    
 	function __construct() {
-		$this->TestSuite('Remote tests');
-
+                $this->label = 'Remote tests'; 
+		//??? next string means??
+                //$this->TestSuite('Remote tests');
 		// TODO: maik, v2 Scheduler not usable atm.
 		// $this->collect(__DIR__.'/integration', new SimpleCollector());
 		// TODO: maik, remove the next 2 lines when v2 Scheduler was fixed.
diff --git a/test/unit/AddressTest.php b/test/unit/AddressTest.php
index d0b1511..94a175c 100644
--- a/test/unit/AddressTest.php
+++ b/test/unit/AddressTest.php
@@ -39,10 +39,10 @@ function testSerialize() {
   <first_name>Hans</first_name>
   <last_name>Hübner</last_name>
   <address1>Kuhrfürstenstr. 124</address1>
-  <address2></address2>
+  <address2/>
   <zip_code>10578</zip_code>
   <city>Berlin</city>
-  <state></state>
+  <state/>
   <country>DE</country>
 </r>
 ');
diff --git a/test/unit/CurlTest.php b/test/unit/CurlTest.php
index 44ae05b..189beb6 100644
--- a/test/unit/CurlTest.php
+++ b/test/unit/CurlTest.php
@@ -13,11 +13,12 @@ function testPostToInvalidShouldThrowException() {
 		} catch(Errors\NetworkError $exe) {
 			$this->assertEqual('https://test.hypercharge.net/eine/falsche/url', $exe->url);
 			$this->assertIdentical(404, $exe->http_status);
-			$this->assertEqual('The requested URL returned error: 404', $exe->technical_message);
+			$this->assertEqual('The requested URL returned error: 404 Not Found', $exe->technical_message);
 			$this->assertPattern('/^Array\n\(\n/', $exe->body);
 		}
 	}
-
+        
+        //Returns "Connection to payment Gateway failed." Is it a security reason?
 	function testPostToValidUrlShouldReturnBody() {
 		try {
 			$curl = new Curl('user', 'passw');
@@ -77,7 +78,7 @@ function testJsonGetToInValidHostShouldThrow() {
 
 	function testJsonGetToInValidUrlShouldThrow() {
 		if(!$this->credentials('sandbox')) return;
-
+                
 		try {
 			$curl = new Curl($this->credentials->user, $this->credentials->password);
 			$curl->jsonGet(new v2\Url('sandbox', 'scheduler/123455668798797'));