                 XCTAssertNotNil(language.nativeSpeakers)
                 XCTAssertNotNil(language.wikipedia)
                 
-                validExpectation.fulfill()
-                
-        }
-        
-        waitForExpectationsWithTimeout(timeout, handler: { error in XCTAssertNil(error, "Timeout") })
-        
-    }
-    
-    func testInvalidURLGetLanguage() {
-        
-        let invalidExpectation = expectationWithDescription("invalid")
+                invalidExpectation.fulfill()
+                
+        }
+        
+        waitForExpectationsWithTimeout(timeout, handler: { error in XCTAssertNil(error, "Timeout") })
+        
+    }
+    
+    func testURLGetLanguage() {
+        
+        let validExpectation = expectationWithDescription("valid")
         
         instance.getLanguage(requestType: .URL,
             html: nil,
-            url: "http://www.keywordAnalysisDotComShouldNotExist.com",
-            text: nil) {
-                
-                (error, language) in
-                
-                XCTAssertNotNil(language)
-                XCTAssertNil(language.ethnologue)
-                XCTAssertNil(language.wikipedia)
-                XCTAssertNotNil(language.language)
-                
-                invalidExpectation.fulfill()
-                
-        }
-        
-        waitForExpectationsWithTimeout(timeout, handler: { error in XCTAssertNil(error, "Timeout") })
-        
-    }
-    
-    func testTextGetLanguage() {
-        
-        let validExpectation = expectationWithDescription("valid")
-        
-        instance.getLanguage(requestType: .Text,
-            html: nil,
-            url: nil,
-            text: test_text_valid) {
+            url: test_url,
+            text: nil) {
                 
                 (error, language) in
                 

        waitForExpectationsWithTimeout(timeout, handler: { error in XCTAssertNil(error, "Timeout") })
        
    }

    
    // MARK: Text Extraction

        
    }
    
    func testInvalidURLGetLanguage() {
        
        let invalidExpectation = expectationWithDescription("invalid")
        
        instance.getLanguage(requestType: .URL,
            html: nil,
            url: "http://www.keywordAnalysisDotComShouldNotExist.com",
            text: nil) {
                
                (error, language) in
                
