diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index 59e1b6e..b21a2d4 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -1,6 +1,6 @@
 //
 //  AbstractSocketTest.swift
-//  Socket.IO-Client-Swift
+//  AbstractSocketTest.socket.IO-Client-Swift
 //
 //  Created by Lukas Schmidt on 02.08.15.
 //
@@ -11,21 +11,24 @@ import XCTest
 class AbstractSocketTest: XCTestCase {
     static let serverURL = "milkbartube.com:6979"
     static let TEST_TIMEOUT = 8.0
-    var socket:SocketIOClient!
+    static var socket:SocketIOClient!
+//    var socket:SocketIOClient!
     var testKind:TestKind?
     
     
-    
     func openConnection() {
+        print(AbstractSocketTest.socket.status.description)
+        guard AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected else {return}
         weak var expection = self.expectationWithDescription("connect")
-        XCTAssertTrue(socket.status == SocketIOClientStatus.NotConnected)
-        socket.on("connect") {data, ack in
+        XCTAssertTrue(AbstractSocketTest.socket.status == SocketIOClientStatus.NotConnected)
+        AbstractSocketTest.socket.on("connect") {data, ack in
+            print("Conected")
             if let expection = expection {
                 expection.fulfill()
             }
         }
-        socket.connect()
-        XCTAssertEqual(socket.status, SocketIOClientStatus.Connecting)
+        AbstractSocketTest.socket.connect()
+        XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connecting)
         waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
     }
     
@@ -34,8 +37,8 @@ class AbstractSocketTest: XCTestCase {
     }
     
     func checkConnectionStatus() {
-        XCTAssertEqual(socket.status, SocketIOClientStatus.Connected)
-        XCTAssertFalse(socket.secure)
+        XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connected)
+        XCTAssertFalse(AbstractSocketTest.socket.secure)
     }
     
     func socketMultipleEmit(testName:String, emitData:Array<AnyObject>, callback:NormalCallback){
@@ -48,8 +51,8 @@ class AbstractSocketTest: XCTestCase {
             }
         }
         
-        socket.emit(finalTestname, withItems: emitData)
-        socket.on(finalTestname + "Return", callback: didGetEmit)
+        AbstractSocketTest.socket.emit(finalTestname, withItems: emitData)
+        AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit)
         waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
     }
     
@@ -65,11 +68,11 @@ class AbstractSocketTest: XCTestCase {
             
         }
         
-        socket.on(finalTestname + "Return", callback: didGetEmit)
+        AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit)
         if let emitData = emitData {
-            socket.emit(finalTestname, emitData)
+            AbstractSocketTest.socket.emit(finalTestname, emitData)
         } else {
-            socket.emit(finalTestname)
+            AbstractSocketTest.socket.emit(finalTestname)
         }
         
         waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
@@ -85,7 +88,7 @@ class AbstractSocketTest: XCTestCase {
             }
         }
         
-        socket.emitWithAck(finalTestname, withItems: Data)(timeoutAfter: 5, callback: didGetResult)
+        AbstractSocketTest.socket.emitWithAck(finalTestname, withItems: Data)(timeoutAfter: 5, callback: didGetResult)
         waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
     }
     
@@ -100,9 +103,9 @@ class AbstractSocketTest: XCTestCase {
         }
         var ack:OnAckCallback!
         if let Data = Data {
-            ack = socket.emitWithAck(finalTestname, Data)
+            ack = AbstractSocketTest.socket.emitWithAck(finalTestname, Data)
         } else {
-            ack = socket.emitWithAck(finalTestname)
+            ack = AbstractSocketTest.socket.emitWithAck(finalTestname)
         }
         ack(timeoutAfter: 20, callback: didGet)
         
diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
index 313c372..045d32e 100644
--- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
@@ -13,13 +13,16 @@ class SocketAcknowledgementTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         testKind = TestKind.Acknowledgement
-        socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
+        if AbstractSocketTest.socket == nil {
+            AbstractSocketTest.socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
             "reconnects": true, // default true
             "reconnectAttempts": -1, // default -1
             "reconnectWait": 5, // default 10
             "forcePolling": false,
             "forceWebsockets": false,// default false
             "path": ""])
+        }
+        
         openConnection()
     }
     
diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift
index eacff7d..958f241 100644
--- a/SocketIO-iOSTests/SocketEmitTest.swift
+++ b/SocketIO-iOSTests/SocketEmitTest.swift
@@ -13,14 +13,17 @@ class SocketEmitTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         testKind = TestKind.Emit
-        socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
-            "reconnects": true, // default true
-            "reconnectAttempts": -1, // default -1
-            "reconnectWait": 5, // default 10
-            "forcePolling": false,
-            "forceWebsockets": false,// default false
-            "path": ""]
+        if AbstractSocketTest.socket == nil {
+            AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
+                "reconnects": true, // default true
+                "reconnectAttempts": -1, // default -1
+                "reconnectWait": 5, // default 10
+                "forcePolling": false,
+                "forceWebsockets": false,// default false
+                "path": ""]
             )
+        }
+        
         openConnection()
     }
     
diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
index 99a4374..a7ae5b9 100644
--- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
@@ -13,7 +13,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         testKind = TestKind.Acknowledgement
-        socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
+        if AbstractSocketTest.socket == nil {
+            AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
             "reconnects": true, // default true
             "reconnectAttempts": -1, // default -1
             "reconnectWait": 5, // default 10
@@ -21,6 +22,8 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
             "forceWebsockets": false,// default false
             "path": "",
             "nsp": "/swift"])
+        }
+        
         openConnection()
     }
     
diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
index 324d161..cac2fe9 100644
--- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift
@@ -13,7 +13,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest {
     override func setUp() {
         super.setUp()
         testKind = TestKind.Emit
-        socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
+        if AbstractSocketTest.socket == nil {
+            AbstractSocketTest.socket = SocketIOClient(socketURL: AbstractSocketTest.serverURL, opts: [
             "reconnects": true, // default true
             "reconnectAttempts": -1, // default -1
             "reconnectWait": 5, // default 10
@@ -21,6 +22,8 @@ class SocketNamespaceEmitTest: AbstractSocketTest {
             "forceWebsockets": false,// default false
             "path": "",
             "nsp": "/swift"])
+        }
+        
         openConnection()
     }