diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
index 81247d9..733ef74 100644
--- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift
@@ -71,6 +71,19 @@ class SocketAcknowledgementTest: SocketEmitTest {
         super.testMultipleItemsEmit()
     }
     
+    override func abstractSocketMultipleEmit(testName:String, emitData:Array<AnyObject>, callback:NormalCallback){
+        let finalTestname = generateTestName(testName)
+        let expection = self.expectationWithDescription(finalTestname)
+        func didGetEmit(result:NSArray?) {
+            callback(result, nil)
+            expection.fulfill()
+        }
+        
+        socket.emitWithAck(finalTestname, withItems: emitData)(timeoutAfter: 5, callback: didGetEmit)
+        waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
+        
+    }
+    
     override func abstractSocketEmit(testName:String, emitData:AnyObject?, callback:NormalCallback){
         let finalTestname = testName + testKind.rawValue
         let expection = self.expectationWithDescription(finalTestname)
diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift
index 7516224..48a43f7 100644
--- a/SocketIO-iOSTests/SocketEmitTest.swift
+++ b/SocketIO-iOSTests/SocketEmitTest.swift
@@ -10,7 +10,7 @@ import XCTest
 import Foundation
 
 class SocketEmitTest: XCTestCase {
-    static let TEST_TIMEOUT = 5.0
+    static let TEST_TIMEOUT = 15.0
     var socket:SocketIOClient!
     let headers = ["testing": "blah", "testing2": "b/:lah"]
     var testKind = TestKind.Emit
@@ -185,8 +185,7 @@ class SocketEmitTest: XCTestCase {
             XCTAssertEqual(result!.count, 5)
             if let array = result?.firstObject as? Array<AnyObject> {
                 XCTAssertEqual(array.last! as! Int, 2)
-                let string = NSString(data: array.first! as! NSData, encoding: NSUTF8StringEncoding)!
-                XCTAssertEqual(string, "gakgakgak2")
+                XCTAssertEqual(array.first! as! Int, 1)
             }else {
                 XCTFail("Should have Array as result")
             }
diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
index 318ba76..a8d715e 100644
--- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
+++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 
-class SocketNamespaceAcknowledgementTest: SocketEmitTest {
+class SocketNamespaceAcknowledgementTest: SocketAcknowledgementTest {
 
     override func setUp() {
         super.setUp()
@@ -72,24 +72,4 @@ class SocketNamespaceAcknowledgementTest: SocketEmitTest {
     override func testMultipleItemsEmit() {
         super.testMultipleItemsEmit()
     }
-    
-    override func abstractSocketEmit(testName:String, emitData:AnyObject?, callback:NormalCallback){
-        let finalTestname = testName + testKind.rawValue
-        let expection = self.expectationWithDescription(finalTestname)
-        func didGetEmit(result:NSArray?) {
-            callback(result, nil)
-            expection.fulfill()
-        }
-        var ack:OnAckCallback!
-        if let emitData = emitData {
-            ack = socket.emitWithAck(finalTestname, emitData)
-        } else {
-            ack = socket.emitWithAck(finalTestname)
-        }
-        ack(timeoutAfter: 20, callback: didGetEmit)
-        
-        waitForExpectationsWithTimeout(SocketEmitTest.TEST_TIMEOUT, handler: nil)
-    }
-
-
 }