         return Aldo.port
     }
     
-    override public class func request(command: String, method: HTTPMethod, parameters: Parameters, callback: Callback? = nil) {
+    override public class func request(uri: String, method: HTTPMethod, parameters: Parameters, callback: Callback? = nil) {
         var response: Dictionary<String, Any> = [:]
-        var components = command.components(separatedBy: "/")
+        var components = uri.components(separatedBy: "/")
         
-        switch command {
+        switch uri {
         case Regex(pattern: RequestURI.REQUEST_AUTH_TOKEN.regex()):
             response["deviceID"] = AldoTests.deviceId
             response["token"] = AldoTests.authToken
             break
         case Regex(pattern: RequestURI.SESSION_CREATE.regex()):
-            var tokens: Dictionary<String, String> = [:]
-            tokens["moderator"] = AldoTests.moderatorToken
-            tokens["user"] = AldoTests.userToken
-            
-            var session: Dictionary<String, Any> = createSessionResponse()
-            session["tokens"] = tokens
-            
-            response["playerID"] = AldoTests.playerId
-            response["session"] = session
-            response["role"] = Player.Role.ADMIN.rawValue
-            response["score"] = 0
+            response = createPlayerResponse(role: Player.Role.ADMIN)
             response["username"] = components[3]
             break
         case Regex(pattern: RequestURI.SESSION_JOIN.regex()):

        default:
            break
        }
        AldoMainCallback(callback: callback).onResponse(request: command, responseCode: 200, response: response as NSDictionary)
    }
    
    public static func createSessionResponse() -> Dictionary<String, Any> {
        var response: Dictionary<String, Any> = [:]
        response["sessionID"] = AldoTests.sessionId
        response["adminID"] = AldoTests.playerId
        response["status"] = Session.Status.PLAYING.rawValue
        response["created"] = AldoTests.creationDate
        return response
    }
    
    public static func createPlayerResponse() -> Dictionary<String, Any> {
        var response: Dictionary<String, Any> = [:]
        response["playerID"] = AldoTests.playerId
        response["session"] = createSessionResponse()
        response["role"] = Player.Role.USER.rawValue
        response["score"] = 0
        response["username"] = AldoTests.username
        return response

            response["username"] = components[5]
            break
        case Regex(pattern: RequestURI.SESSION_INFO.regex()):
            let player: Player = MockAldo.getPlayer()!
            response = createSessionResponse(role: player.getRole())
            break
        case Regex(pattern: RequestURI.SESSION_PLAYERS.regex()):
            var players = [Dictionary<String, Any>]()
