 
             XCTAssertNotNil(result)
 
-            finishCounter += 1
-            if finishCounter == 2 {
-                expectation.fulfill()
-            }
+            expectation.fulfill()
         }
 
-        // fail
-        self.teapot?.post("/put") { (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)
+        self.waitForExpectations(timeout: 20.0)
     }
 
     func testDelete() {
         let expectation = self.expectation(description: "Delete")
-        var finishCounter = 0
 
         // pass
         self.teapot?.delete("/delete") { (result) in

            expectation.fulfill()
        }

        self.waitForExpectations(timeout: 10.0)
    }

    func testEscapedQuery() {


            XCTAssertNotNil(result)

            expectation.fulfill()
        }

        self.waitForExpectations(timeout: 20.0)
    }

    func testQuery() {
