 
             XCTAssertNotNil(result)
 
-            finishCounter += 1
-            if finishCounter == 2 {
-                expectation.fulfill()
-            }
+            expectation.fulfill()
         }
 
-        // fail
-        self.teapot?.put("/get") { (result: NetworkResult) in
-            switch result {
-            case .success(_, _):
-                break
-            case .failure(_, _, let error):
-                XCTAssertNotNil(error)
-            }
-
-            XCTAssertNotNil(result)
-
-            finishCounter += 1
-            if finishCounter == 2 {
-                expectation.fulfill()
-            }
-        }
-
-        self.waitForExpectations(timeout: 10.0)
+        self.waitForExpectations(timeout: 20.0)
     }
 
     func testPost() {
         let expectation = self.expectation(description: "Post")
-        var finishCounter = 0
 
         // pass
         self.teapot?.post("/post") { (result) in


            XCTAssertNotNil(result)

            finishCounter += 1
            if finishCounter == 2 {
                expectation.fulfill()
            }
        }

        // fail
        self.teapot?.delete("/get") { (result) in

            switch result {
            case .success(_, _):
                break
            case .failure(_, _, let error):
                XCTAssertNotNil(error)
            }

            XCTAssertNotNil(result)

            finishCounter += 1
            if finishCounter == 2 {
                expectation.fulfill()
            }
        }

        self.waitForExpectations(timeout: 10.0)
    }

    func testQuery() {


            XCTAssertNotNil(result)

            expectation.fulfill()
        }

        self.waitForExpectations(timeout: 20.0)
    }

    func testDelete() {
        let expectation = self.expectation(description: "Delete")

        // pass
        self.teapot?.delete("/delete") { (result) in
