diff --git a/.travis.yml b/.travis.yml
index 71a19d2..46756e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,9 @@ language: objective-c
 xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
 xcode_scheme: SocketIO-iOS
 osx_image: xcode7
-script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS -sdk iphonesimulator build test  CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
\ No newline at end of file
+script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS -sdk iphonesimulator build test  CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+before_install: 
+install: cd Socket.IO-Test-Server/ && npm install && cd .. && node Socket.IO-Test-Server/main.js &
+cache:
+  directories:
+    - Socket.IO-Test-Server/node_modules
\ No newline at end of file
diff --git a/Socket.IO-Test-Server/main.js b/Socket.IO-Test-Server/main.js
index fb4a05d..4f13276 100644
--- a/Socket.IO-Test-Server/main.js
+++ b/Socket.IO-Test-Server/main.js
@@ -1,6 +1,8 @@
-var app = require('express')()
-var server = app.listen(6979)
-var io = require('socket.io')(server)
+var app = require('http').createServer()
+var io = require('socket.io')(app);
+app.listen(6979)
+
+
 var acknowledgementsEvents = require("./acknowledgementEvents.js")
 var emitEvents = require("./emitEvents.js")
 var socketEventRegister = require("./socketEventRegister.js")
diff --git a/Socket.IO-Test-Server/package.json b/Socket.IO-Test-Server/package.json
index a62aa0b..eb10dba 100644
--- a/Socket.IO-Test-Server/package.json
+++ b/Socket.IO-Test-Server/package.json
@@ -9,7 +9,6 @@
   "author": "Lukas Schmidt",
   "license": "MIT",
   "dependencies": {
-    "express": "^4.13.1",
     "socket.io": "^1.3.6"
   }
 }
diff --git a/SocketIO-iOSTests/AbstractSocketTest.swift b/SocketIO-iOSTests/AbstractSocketTest.swift
index 4169af1..d411e19 100644
--- a/SocketIO-iOSTests/AbstractSocketTest.swift
+++ b/SocketIO-iOSTests/AbstractSocketTest.swift
@@ -9,8 +9,7 @@
 import XCTest
 
 class AbstractSocketTest: XCTestCase {
-    static let testLocal = false
-    static let serverURL = AbstractSocketTest.testLocal ? "localhost:6979" : "milkbartube.com:6979"
+    static let serverURL = "localhost:6979"
     static let TEST_TIMEOUT = 8.0
     static var socket:SocketIOClient!
     var testKind:TestKind?
@@ -30,6 +29,7 @@ class AbstractSocketTest: XCTestCase {
         }
         AbstractSocketTest.socket.connect()
         XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connecting)
+        print(AbstractSocketTest.socket.sid)
         waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
     }
     
@@ -66,7 +66,6 @@ class AbstractSocketTest: XCTestCase {
             if let expection = expection {
                 expection.fulfill()
             }
-            
         }
         
         AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit)
diff --git a/SocketIOClientSwift/SwiftRegex.swift b/SocketIOClientSwift/SwiftRegex.swift
index fcd7652..b088918 100644
--- a/SocketIOClientSwift/SwiftRegex.swift
+++ b/SocketIOClientSwift/SwiftRegex.swift
@@ -29,8 +29,8 @@ internal class SwiftRegex: NSObject, BooleanType {
                     NSRegularExpressionOptions.DotMatchesLineSeparators)
                 swiftRegexCache[pattern] = regex
                 self.regex = regex
-            } catch let error1 as NSError {
-                SwiftRegex.failure("Error in pattern: \(pattern) - \(error1)")
+            } catch let error as NSError {
+                SwiftRegex.failure("Error in pattern: \(pattern) - \(error)")
                 self.regex = NSRegularExpression()
             }
         }
@@ -46,7 +46,7 @@ internal class SwiftRegex: NSObject, BooleanType {
     }
     
     private final func substring(range: NSRange) -> String? {
-        if ( range.location != NSNotFound ) {
+        if range.location != NSNotFound {
             return (target as NSString).substringWithRange(range)
         } else {
             return nil
@@ -70,20 +70,19 @@ internal class SwiftRegex: NSObject, BooleanType {
             NSMatchingOptions.WithoutAnchoringBounds, range: targetRange))
     }
     
-    private func groupsForMatch(match: NSTextCheckingResult!) -> [String]? {
-        if match != nil {
-            var groups = [String]()
-            for groupno in 0...regex.numberOfCaptureGroups {
-                if let group = substring(match.rangeAtIndex(groupno)) {
-                    groups += [group]
-                } else {
-                    groups += ["_"] // avoids bridging problems
-                }
-            }
-            return groups
-        } else {
+    private func groupsForMatch(match: NSTextCheckingResult?) -> [String]? {
+        guard let match = match else {
             return nil
         }
+        var groups = [String]()
+        for groupno in 0...regex.numberOfCaptureGroups {
+            if let group = substring(match.rangeAtIndex(groupno)) {
+                groups += [group]
+            } else {
+                groups += ["_"] // avoids bridging problems
+            }
+        }
+        return groups
     }
     
     subscript(groupno: Int) -> String? {
@@ -124,7 +123,7 @@ internal class SwiftRegex: NSObject, BooleanType {
     }
     
     func allGroups() -> [[String]?] {
-        return matchResults().map {self.groupsForMatch($0)}
+        return matchResults().map { self.groupsForMatch($0) }
     }
     
     func dictionary(options: NSMatchingOptions!) -> Dictionary<String,String> {