diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index 5f66991..e5b16d5 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -20,11 +20,12 @@ class AbstractSocketTest: XCTestCase {
     
     func openConnection() {
         let expection = self.expectationWithDescription("connect")
+        XCTAssertTrue(socket.status == SocketIOClientStatus.NotConnected)
         socket.on("connect") {data, ack in
             expection.fulfill()
         }
         socket.connect()
-        XCTAssertTrue(socket.connecting)
+        XCTAssertEqual(socket.status, SocketIOClientStatus.Connecting)
         waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
     }
     
@@ -33,10 +34,7 @@ class AbstractSocketTest: XCTestCase {
     }
     
     func checkConnectionStatus() {
-        XCTAssertTrue(socket.connected)
-        XCTAssertFalse(socket.connecting)
-        XCTAssertFalse(socket.reconnecting)
-        XCTAssertFalse(socket.closed)
+        XCTAssertEqual(socket.status, SocketIOClientStatus.Connected)
         XCTAssertFalse(socket.secure)
     }
     
diff --git a/SocketIO-iOSTests/SocketTestCases.swift b/SocketIO-iOSTests/SocketTestCases.swift
index e17718e..617fb13 100644
--- a/SocketIO-iOSTests/SocketTestCases.swift
+++ b/SocketIO-iOSTests/SocketTestCases.swift
@@ -52,8 +52,8 @@ class SocketTestCases: NSObject {
         func didGetResult(result:NSArray?, ack:AckEmitter?) {
             if let array = result?.firstObject as? NSArray {
                 XCTAssertEqual(array.count, 2)
-                XCTAssertEqual(array.firstObject! as! String, "test3")
-                XCTAssertEqual(array.lastObject! as! String, "test4")
+                XCTAssertEqual((array.firstObject! as! String), "test3")
+                XCTAssertEqual((array.lastObject! as! String), "test4")
             }else {
                 XCTFail("Should have NSArray as result")
             }