              "Basic dXNlcjpwYXNzd29yZA==")))))
 
 (deftest request-post
-  (with-ring-server echo-rhandler
+  (with-ring-server echo-handler
     (let [response (http/post base-url {:body "foobar"})
           request-map (read-request response)]
       (is (= (:request-method request-map) :post))
       (is (= "foobar" (:body response))))))
 
 (deftest request-put
-  (with-ring-server echo-rhandler
+  (with-ring-server echo-handler
     (let [response (http/put base-url {:body "foobar"})
           request-map (read-request response)]
       (is (= (:request-method request-map) :put))
       (is (= "foobar" (:body response))))))
 
 (deftest request-translate
-  (with-ring-server echo-rhandler
+  (with-ring-server echo-handler
     (let [url (str base-url "/foo/bar/baz?surname=jones&age=123")
           response (http/post url {:body "hello"})]
       (is (= (:status response) 200))

        (is (= (:server-name request-map) "127.0.0.1"))
        (is (= (:server-port request-map) 5050))
        (is (= (:ssl-client-cert request-map) nil))))))

       ~@body
       (finally (.stop server#)))))

(defn echo-handler
  [request]
  {:status 200
   :headers {"request-map" (pr-str (dissoc request :body))}
   :body (:body request)})

(defn content-type-handler
  [content-type]
  (fn [request]
    {:status  200
     :headers {"Content-Type" content-type}
     :body    ""}))

(defn read-request
  [response]
