   (testing "Simple cors request"
     (let [p (promise)
           handler (fn [ctx] (deliver p ctx) "hello world")
-          handler (ct/routes [[:any hs/basic-request]
-                              [:any handler]])]
+          handler (ct/routes [[:any handler]])]
       (with-server {:handler handler}
         (let [response (client/get (str base-url "/foo"))
               ctx (deref p 1000 {})]
+          (is (contains? ctx :body))
+          (is (contains? ctx :query))
+          (is (contains? ctx :query-params))
+          (is (contains? ctx :route-params))
+          (is (contains? ctx :headers))
+          (is (contains? ctx :cookies))
+          (is (contains? ctx :path))
+          (is (contains? ctx :catacumba/request))
+          (is (contains? ctx :catacumba/context))
+          (is (contains? ctx :catacumba/response))
           (is (= (:body response) "hello world"))
-          (is (= (:status response) 200))
-          (is (= (:method ctx) :get))
-          (is (= (:path ctx) "/foo")))))))
+          (is (= (:status response) 200)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Session tests


(deftest interceptors-tests
  (let [counter (atom 0)
        p1 (promise)
        p2 (promise)
        p3 (promise)
        p4 (promise)]
    (letfn [(interceptor [_ type continuation]
              (deliver p1 (swap! counter inc))
              (continuation)
              (deliver p2 (swap! counter inc)))

            (handler2 [context]
              (deliver p3 (swap! counter inc))
              (ct/delegate context))

            (handler3 [context]
              (deliver p4 (swap! counter inc))
              "hello world")]
      (with-server {:handler (ct/routes [[:interceptor interceptor]
                                         [:any handler2]
                                         [:any handler3]])}
        (let [response (client/get base-url)]
          (is (= (:body response) "hello world"))
          (is (= (:status response) 200))
          (is (= (deref p1 1000 nil) 1))
          (is (= (deref p2 1000 nil) 4))
          (is (= (deref p3 1000 nil) 2))
          (is (= (deref p4 1000 nil) 3)))))))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

    (let [p (promise)
          app (ct/routes [[:any (hs/body-params)]
                          [:any #(do
                                   (deliver p (:data %))
                                   "hello world")]])]
      (with-server {:handler app}
        (let [response (client/post base-url {:body (json/generate-string {:foo "bar"})
