diff --git a/collects/web-server/servlet/web.ss b/collects/web-server/servlet/web.ss
index 02aff69e33..8a18e76af6 100644
--- a/collects/web-server/servlet/web.ss
+++ b/collects/web-server/servlet/web.ss
@@ -76,7 +76,7 @@
       [(procedure? p-exp) (p->a p-exp)]
       [else p-exp])) 
   
-  ;; Weak contracts: the input is checked in output-response, and a message is
+  ;; XXX Weak contracts: the input is checked in output-response, and a message is
   ;; sent directly to the client (Web browser) instead of the terminal/log.
   (provide/contract
    [xexpr/callback->xexpr (embed/url? xexpr/callback? . -> . xexpr?)]
diff --git a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss b/collects/web-server/tests/dispatchers/dispatch-lang-test.ss
index 3de5a38eb0..f68019075e 100644
--- a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-lang-test.ss
@@ -7,7 +7,14 @@
      "Web Language"
      
      ; XXX test web.ss
+     (test-suite
+      "web.ss")
+
      ; XXX test web-extras.ss
-     ; XXX test web-cells.ss
+     (test-suite
+      "web-extras.ss")
      
+     ; XXX test web-cells.ss
+     (test-suite
+      "web-cell.ss")
      )))
\ No newline at end of file
diff --git a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
index 334877d62d..b120c750eb 100644
--- a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
@@ -90,7 +90,18 @@
      
      (test-suite
       "servlet/web.ss"
-      ; XXX test web.ss
+      ; XXX current-url-transform
+      ; XXX current-servlet-continuation-expiration-handler
+      ; XXX redirect/get
+      ; XXX redirect/get/forget
+      ; XXX adjust-timeout!
+      ; XXX clear-continuation-table!
+      ; XXX send/back
+      ; XXX send/finish
+      ; XXX send/suspend
+      ; XXX send/forward
+      ; XXX send/suspend/dispatch
+      ; XXX send/suspend/callback
       )
      
      )))
\ No newline at end of file
diff --git a/collects/web-server/tests/servlet/all-servlet-tests.ss b/collects/web-server/tests/servlet/all-servlet-tests.ss
index edcb6b6aaa..1e8261e312 100644
--- a/collects/web-server/tests/servlet/all-servlet-tests.ss
+++ b/collects/web-server/tests/servlet/all-servlet-tests.ss
@@ -3,7 +3,8 @@
            "bindings-test.ss"
            "servlet-url-test.ss"
            "basic-auth-test.ss"
-           "helpers-test.ss")
+           "helpers-test.ss"
+           "web-test.ss")
   (provide all-servlet-tests)
   
   (define all-servlet-tests
@@ -12,4 +13,5 @@
      bindings-tests
      servlet-url-tests
      basic-auth-tests
-     helpers-tests)))
\ No newline at end of file
+     helpers-tests
+     web-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/servlet/web-test.ss b/collects/web-server/tests/servlet/web-test.ss
new file mode 100644
index 0000000000..f3c22f7cd5
--- /dev/null
+++ b/collects/web-server/tests/servlet/web-test.ss
@@ -0,0 +1,20 @@
+(module web-test mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
+           (lib "web.ss" "web-server" "servlet"))
+  (provide web-tests)
+  
+  (define web-tests
+    (test-suite
+     "Web"
+     
+     (test-suite 
+      "continuation-url?"
+      )
+     
+     (test-suite
+      "embed-ids"
+      )
+     
+     (test-suite
+      "xexpr/callback->xexpr"
+      ))))
\ No newline at end of file