diff --git a/collects/tests/mzscheme/net.ss b/collects/tests/mzscheme/net.ss
index ab8e1ddde0..016a3b29b5 100644
--- a/collects/tests/mzscheme/net.ss
+++ b/collects/tests/mzscheme/net.ss
@@ -45,38 +45,44 @@
             (url-query url)
             (url-fragment url)))
   
-  (test-s->u (vector #f #f #f #f '("") #f #f)
+  (test-s->u (vector #f #f #f #f '("") '() #f)
              "/")
-  (test-s->u (vector #f #f #f #f '() #f #f)
+  (test-s->u (vector #f #f #f #f '() '() #f)
              "")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f '("") #f #f)
+  (test-s->u (vector "http" #f "www.drscheme.org" #f '("") '() #f)
              "http://www.drscheme.org/")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") #f #f)
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '() #f)
              "http://www.drscheme.org/a/b/c")
-  (test-s->u (vector "http" "robby" "www.drscheme.org" #f (list "a" "b" "c") #f #f)
+  (test-s->u (vector "http" "robby" "www.drscheme.org" #f (list "a" "b" "c") '() #f)
              "http://robby@www.drscheme.org/a/b/c")
-  (test-s->u (vector "http" #f "www.drscheme.org" 8080 (list "a" "b" "c") #f #f)
+  (test-s->u (vector "http" #f "www.drscheme.org" 8080 (list "a" "b" "c") '() #f)
              "http://www.drscheme.org:8080/a/b/c")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") #f "joe")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '() "joe")
              "http://www.drscheme.org/a/b/c#joe")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") "tim" #f)
-             "http://www.drscheme.org/a/b/c?tim")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") "tim" "joe")
-             "http://www.drscheme.org/a/b/c?tim#joe")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" #("c" "b")) #f #f)
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '((tim . "")) #f)
+             "http://www.drscheme.org/a/b/c?tim=")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '((tim . "")) "joe")
+             "http://www.drscheme.org/a/b/c?tim=#joe")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '((tim . "tim")) "joe")
+             "http://www.drscheme.org/a/b/c?tim=tim#joe")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '((tam . "tom")) "joe")
+             "http://www.drscheme.org/a/b/c?tam=tom#joe")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '((tam . "tom") (pam . "pom")) "joe")
+             "http://www.drscheme.org/a/b/c?tam=tom&pam=pom#joe")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" #("c" "b")) '() #f)
              "http://www.drscheme.org/a/b/c;b")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list #("a" "x") "b" #("c" "b")) #f #f)
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list #("a" "x") "b" #("c" "b")) '() #f)
              "http://www.drscheme.org/a;x/b/c;b")
   
   ;; test unquoting for %
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") "ti#m" "jo e")
-             "http://www.drscheme.org/a/b/c?ti%23m#jo%20e")
-  (test-s->u (vector "http" #f "www.drscheme.org" #f (list #("a " " a") " b " " c ") #f #f)
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list "a" "b" "c") '((ti#m . "")) "jo e")
+             "http://www.drscheme.org/a/b/c?ti%23m=#jo%20e")
+  (test-s->u (vector "http" #f "www.drscheme.org" #f (list #("a " " a") " b " " c ") '() #f)
              "http://www.drscheme.org/a ; a/ b / c ")
-  (test-s->u (vector "http" "robb y" "www.drscheme.org" #f '("") #f #f)
+  (test-s->u (vector "http" "robb y" "www.drscheme.org" #f '("") '() #f)
              "http://robb%20y@www.drscheme.org/")
   
-  (let ([empty-url (make-url #f #f #f #f '() #f #f)])
+  (let ([empty-url (make-url #f #f #f #f '() '() #f)])
     (test-c-u/r (string->url "http://www.drscheme.org")
                 empty-url
                 "http://www.drscheme.org")