diff --git a/Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme b/Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme
index e9b0653..baf02a7 100644
--- a/Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme
+++ b/Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme
@@ -37,10 +37,11 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +63,18 @@
             ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index ee1e335..5f66991 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -9,7 +9,7 @@
 import XCTest
 
 class AbstractSocketTest: XCTestCase {
-    static let TEST_TIMEOUT = 4.0
+    static let TEST_TIMEOUT = 8.0
     var socket:SocketIOClient!
     var testKind:TestKind?
     
@@ -25,7 +25,7 @@ class AbstractSocketTest: XCTestCase {
         }
         socket.connect()
         XCTAssertTrue(socket.connecting)
-        waitForExpectationsWithTimeout(5, handler: nil)
+        waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
     }
     
     func generateTestName(rawTestName:String) ->String {
@@ -42,10 +42,12 @@ class AbstractSocketTest: XCTestCase {
     
     func socketMultipleEmit(testName:String, emitData:Array<AnyObject>, callback:NormalCallback){
         let finalTestname = generateTestName(testName)
-        let expection = self.expectationWithDescription(finalTestname)
+        weak var expection = self.expectationWithDescription(finalTestname)
         func didGetEmit(result:NSArray?, ack:AckEmitter?) {
             callback(result, ack)
-            expection.fulfill()
+            if let expection = expection {
+                expection.fulfill()
+            }
         }
         
         socket.emit(finalTestname, withItems: emitData)
@@ -56,10 +58,13 @@ class AbstractSocketTest: XCTestCase {
     
     func socketEmit(testName:String, emitData:AnyObject?, callback:NormalCallback){
         let finalTestname = generateTestName(testName)
-        let expection = self.expectationWithDescription(finalTestname)
+        weak var expection = self.expectationWithDescription(finalTestname)
         func didGetEmit(result:NSArray?, ack:AckEmitter?) {
             callback(result, ack)
-            expection.fulfill()
+            if let expection = expection {
+                expection.fulfill()
+            }
+            
         }
         
         socket.on(finalTestname + "Return", callback: didGetEmit)
@@ -74,10 +79,12 @@ class AbstractSocketTest: XCTestCase {
     
     func socketAcknwoledgeMultiple(testName:String, Data:Array<AnyObject>, callback:NormalCallback){
         let finalTestname = generateTestName(testName)
-        let expection = self.expectationWithDescription(finalTestname)
+        weak var expection = self.expectationWithDescription(finalTestname)
         func didGetResult(result:NSArray?) {
             callback(result, nil)
-            expection.fulfill()
+            if let expection = expection {
+                expection.fulfill()
+            }
         }
         
         socket.emitWithAck(finalTestname, withItems: Data)(timeoutAfter: 5, callback: didGetResult)
@@ -86,10 +93,12 @@ class AbstractSocketTest: XCTestCase {
     
     func socketAcknwoledge(testName:String, Data:AnyObject?, callback:NormalCallback){
         let finalTestname = generateTestName(testName)
-        let expection = self.expectationWithDescription(finalTestname)
+        weak var expection = self.expectationWithDescription(finalTestname)
         func didGet(result:NSArray?) {
             callback(result, nil)
-            expection.fulfill()
+            if let expection = expection {
+                expection.fulfill()
+            }
         }
         var ack:OnAckCallback!
         if let Data = Data {