diff --git a/racket/lib/collects/file/tests/test-docs-complete.rkt b/pkgs/racket-pkgs/racket-test/tests/file/test-docs-complete.rkt
similarity index 100%
rename from racket/lib/collects/file/tests/test-docs-complete.rkt
rename to pkgs/racket-pkgs/racket-test/tests/file/test-docs-complete.rkt
diff --git a/racket/lib/collects/launcher/tests/test-docs-complete.rkt b/pkgs/racket-pkgs/racket-test/tests/launcher/test-docs-complete.rkt
similarity index 100%
rename from racket/lib/collects/launcher/tests/test-docs-complete.rkt
rename to pkgs/racket-pkgs/racket-test/tests/launcher/test-docs-complete.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-db.rkt b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-db.rkt
new file mode 100644
index 0000000000..79f86ef34f
--- /dev/null
+++ b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-db.rkt
@@ -0,0 +1,101 @@
+#lang racket/base
+
+  (require rackunit
+           racket/file)
+
+  (define (pkg<? a b)
+    (if (string=? (pkg-name a) (pkg-name b))
+        (string<? (pkg-catalog a) (pkg-catalog b))
+        (string<? (pkg-name a) (pkg-name b))))
+
+  (parameterize ([current-pkg-catalog-file (make-temporary-file
+                                          "~a.sqlite")])
+    (check-equal? (get-catalogs) '())
+
+    (set-catalogs! '("http://a" "http://b"))
+    (check-equal? (get-catalogs)
+                  '("http://a" "http://b"))
+    
+    (check-equal? (get-pkgs) '())
+
+    
+    (set-pkgs! "http://a" '("p1"))
+    (check-equal? (get-pkgs) 
+                  (list
+                   (pkg "p1" "http://a" "" "" "" "")))
+    
+    (set-pkgs! "http://b" '("p2"))
+    (check-equal? (get-pkgs)
+                  (list
+                   (pkg "p1" "http://a" "" "" "" "")
+                   (pkg "p2" "http://b" "" "" "" "")))
+    (check-equal? (get-pkgs #:catalog "http://a") 
+                  (list
+                   (pkg "p1" "http://a" "" "" "" "")))
+    (check-equal? (get-pkgs #:name "p1")
+                  (list
+                   (pkg "p1" "http://a" "" "" "" "")))
+    
+    (set-pkg! "p1" "http://a" "github:a" "adam" "123" "the first package")
+    (check-equal? (get-pkgs)
+                  (list
+                   (pkg "p1" "http://a" "github:a" "adam" "123" "the first package")
+                   (pkg "p2" "http://b" "" "" "" "")))
+
+    ;; reverse order of catalogs:
+    (set-catalogs! '("http://b" "http://a"))
+    (check-equal? (get-catalogs)
+                  '("http://b" "http://a"))
+    (check-equal? (get-pkgs)
+                  (list
+                   (pkg "p2" "http://b" "" "" "" "")
+                   (pkg "p1" "http://a" "github:a" "adam" "123" "the first package")))
+
+    (check-equal? (get-pkg-tags "p2" "http://b")
+                  '())
+    (set-pkg-tags! "p2" "http://b" '("2x" "2y" "2z"))
+    (check-equal? (sort (get-pkg-tags "p2" "http://b") string<?)
+                  '("2x" "2y" "2z"))
+    (check-equal? (get-pkg-tags "p1" "http://a")
+                  '())
+    
+    (set-pkg-modules! "p1" "http://a" "123" (list '(lib "lib1/main.rkt")
+                                                  '(lib "lib2/main.rkt")))
+    (check-equal? (sort (get-pkg-modules "p1" "http://a" "123")
+                        string<?
+                        #:key cadr)
+                  (list '(lib "lib1/main.rkt")
+                        '(lib "lib2/main.rkt")))
+    (check-equal? (get-module-pkgs '(lib "lib1/main.rkt"))
+                  (list
+                   (pkg "p1" "http://a" "" "" "123" "")))
+
+    (set-pkg-dependencies! "p1" "http://a" "123" (list "p7"
+                                                       '("p8" "8.0")
+                                                       '("p9" #:version "9.0")
+                                                       '("p10" #:platform #rx"linux")
+                                                       '("p11" #:platform 'windows)
+                                                       '("p12" #:version "1.2" #:platform 'macosx)
+                                                       '("p13" #:platform 'unix #:version "1.3.2")
+                                                       '("p14" #:platform "")))
+    (check-equal? (sort (get-pkg-dependencies "p1" "http://a" "123")
+                        string<?
+                        #:key car)
+                  '(("p10" #:platform #rx"linux")
+                    ("p11" #:platform 'windows)
+                    ("p12" #:version "1.2" #:platform 'macosx)
+                    ("p13" #:version "1.3.2" #:platform 'unix)
+                    ("p14" #:platform "")
+                    ("p7")
+                    ("p8" #:version "8.0")
+                    ("p9" #:version "9.0")))
+
+    (set-catalogs! '("http://a" "http://c"))
+    (check-equal? (sort (get-catalogs) string<?) 
+                  '("http://a" "http://c"))
+
+    (check-equal? (get-pkgs) 
+                  (list
+                   (pkg "p1" "http://a" "github:a" "adam" "123" "the first package")))
+
+    (delete-file (current-pkg-catalog-file))
diff --git a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt
index a86ebd1338..1172b43eeb 100644
--- a/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/pkg/tests-name.rkt
@@ -38,6 +38,8 @@
   (check-equal-values? (package-source->name+type "fish" 'dir) (values "fish" 'dir))
   (check-equal-values? (package-source->name+type "fish!/" 'dir) (values #f 'dir))
 
+  (check-equal? (package-source->name "http://") #f))
+
   (check-equal-values? (package-source->name+type "http://racket-lang.org/fish.plt" #f) (values "fish" 'file-url))
   (check-equal-values? (package-source->name+type "https://racket-lang.org/fish.plt" #f) (values "fish" 'file-url))
   (check-equal-values? (package-source->name+type "http://racket-lang.org/fish.tar.gz" #f) (values "fish" 'file-url))
diff --git a/pkgs/rackunit-lib/info.rkt b/pkgs/rackunit-lib/info.rkt
new file mode 100644
index 0000000000..b85118802f
--- /dev/null
+++ b/pkgs/rackunit-lib/info.rkt
@@ -0,0 +1,3 @@
+#lang setup/infotab
+
+(define collection 'multi)
diff --git a/racket/lib/collects/rackunit/main.rkt b/pkgs/rackunit-lib/rackunit/main.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/main.rkt
rename to pkgs/rackunit-lib/rackunit/main.rkt
diff --git a/racket/lib/collects/rackunit/private/base.rkt b/pkgs/rackunit-lib/rackunit/private/base.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/base.rkt
rename to pkgs/rackunit-lib/rackunit/private/base.rkt
diff --git a/racket/lib/collects/rackunit/private/check-info.rkt b/pkgs/rackunit-lib/rackunit/private/check-info.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/check-info.rkt
rename to pkgs/rackunit-lib/rackunit/private/check-info.rkt
diff --git a/racket/lib/collects/rackunit/private/check.rkt b/pkgs/rackunit-lib/rackunit/private/check.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/check.rkt
rename to pkgs/rackunit-lib/rackunit/private/check.rkt
diff --git a/racket/lib/collects/rackunit/private/counter.rkt b/pkgs/rackunit-lib/rackunit/private/counter.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/counter.rkt
rename to pkgs/rackunit-lib/rackunit/private/counter.rkt
diff --git a/racket/lib/collects/rackunit/private/format.rkt b/pkgs/rackunit-lib/rackunit/private/format.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/format.rkt
rename to pkgs/rackunit-lib/rackunit/private/format.rkt
diff --git a/racket/lib/collects/rackunit/private/hash-monad.rkt b/pkgs/rackunit-lib/rackunit/private/hash-monad.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/hash-monad.rkt
rename to pkgs/rackunit-lib/rackunit/private/hash-monad.rkt
diff --git a/racket/lib/collects/rackunit/private/location.rkt b/pkgs/rackunit-lib/rackunit/private/location.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/location.rkt
rename to pkgs/rackunit-lib/rackunit/private/location.rkt
diff --git a/racket/lib/collects/rackunit/private/monad.rkt b/pkgs/rackunit-lib/rackunit/private/monad.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/monad.rkt
rename to pkgs/rackunit-lib/rackunit/private/monad.rkt
diff --git a/racket/lib/collects/rackunit/private/name-collector.rkt b/pkgs/rackunit-lib/rackunit/private/name-collector.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/name-collector.rkt
rename to pkgs/rackunit-lib/rackunit/private/name-collector.rkt
diff --git a/racket/lib/collects/rackunit/private/result.rkt b/pkgs/rackunit-lib/rackunit/private/result.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/result.rkt
rename to pkgs/rackunit-lib/rackunit/private/result.rkt
diff --git a/racket/lib/collects/rackunit/private/test-case.rkt b/pkgs/rackunit-lib/rackunit/private/test-case.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/test-case.rkt
rename to pkgs/rackunit-lib/rackunit/private/test-case.rkt
diff --git a/racket/lib/collects/rackunit/private/test-suite.rkt b/pkgs/rackunit-lib/rackunit/private/test-suite.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/test-suite.rkt
rename to pkgs/rackunit-lib/rackunit/private/test-suite.rkt
diff --git a/racket/lib/collects/rackunit/private/test.rkt b/pkgs/rackunit-lib/rackunit/private/test.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/test.rkt
rename to pkgs/rackunit-lib/rackunit/private/test.rkt
diff --git a/racket/lib/collects/rackunit/private/text-ui-util.rkt b/pkgs/rackunit-lib/rackunit/private/text-ui-util.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/text-ui-util.rkt
rename to pkgs/rackunit-lib/rackunit/private/text-ui-util.rkt
diff --git a/racket/lib/collects/rackunit/private/util.rkt b/pkgs/rackunit-lib/rackunit/private/util.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/private/util.rkt
rename to pkgs/rackunit-lib/rackunit/private/util.rkt
diff --git a/racket/lib/collects/rackunit/text-ui.rkt b/pkgs/rackunit-lib/rackunit/text-ui.rkt
similarity index 100%
rename from racket/lib/collects/rackunit/text-ui.rkt
rename to pkgs/rackunit-lib/rackunit/text-ui.rkt
diff --git a/racket/lib/collects/pkg/db.rkt b/racket/lib/collects/pkg/db.rkt
index 95bd683aed..5facd012a4 100644
--- a/racket/lib/collects/pkg/db.rkt
+++ b/racket/lib/collects/pkg/db.rkt
@@ -554,108 +554,3 @@
                             " WHERE type='table' AND name='" which "'")))
     (query-exec db (~a "CREATE TABLE " which " "
                        desc))))
-
-;; ----------------------------------------
-
-(module+ main
-  (require rackunit
-           racket/file)
-
-  (define (pkg<? a b)
-    (if (string=? (pkg-name a) (pkg-name b))
-        (string<? (pkg-catalog a) (pkg-catalog b))
-        (string<? (pkg-name a) (pkg-name b))))
-
-  (parameterize ([current-pkg-catalog-file (make-temporary-file
-                                          "~a.sqlite")])
-    (check-equal? (get-catalogs) '())
-
-    (set-catalogs! '("http://a" "http://b"))
-    (check-equal? (get-catalogs)
-                  '("http://a" "http://b"))
-    
-    (check-equal? (get-pkgs) '())
-
-    
-    (set-pkgs! "http://a" '("p1"))
-    (check-equal? (get-pkgs) 
-                  (list
-                   (pkg "p1" "http://a" "" "" "" "")))
-    
-    (set-pkgs! "http://b" '("p2"))
-    (check-equal? (get-pkgs)
-                  (list
-                   (pkg "p1" "http://a" "" "" "" "")
-                   (pkg "p2" "http://b" "" "" "" "")))
-    (check-equal? (get-pkgs #:catalog "http://a") 
-                  (list
-                   (pkg "p1" "http://a" "" "" "" "")))
-    (check-equal? (get-pkgs #:name "p1")
-                  (list
-                   (pkg "p1" "http://a" "" "" "" "")))
-    
-    (set-pkg! "p1" "http://a" "github:a" "adam" "123" "the first package")
-    (check-equal? (get-pkgs)
-                  (list
-                   (pkg "p1" "http://a" "github:a" "adam" "123" "the first package")
-                   (pkg "p2" "http://b" "" "" "" "")))
-
-    ;; reverse order of catalogs:
-    (set-catalogs! '("http://b" "http://a"))
-    (check-equal? (get-catalogs)
-                  '("http://b" "http://a"))
-    (check-equal? (get-pkgs)
-                  (list
-                   (pkg "p2" "http://b" "" "" "" "")
-                   (pkg "p1" "http://a" "github:a" "adam" "123" "the first package")))
-
-    (check-equal? (get-pkg-tags "p2" "http://b")
-                  '())
-    (set-pkg-tags! "p2" "http://b" '("2x" "2y" "2z"))
-    (check-equal? (sort (get-pkg-tags "p2" "http://b") string<?)
-                  '("2x" "2y" "2z"))
-    (check-equal? (get-pkg-tags "p1" "http://a")
-                  '())
-    
-    (set-pkg-modules! "p1" "http://a" "123" (list '(lib "lib1/main.rkt")
-                                                  '(lib "lib2/main.rkt")))
-    (check-equal? (sort (get-pkg-modules "p1" "http://a" "123")
-                        string<?
-                        #:key cadr)
-                  (list '(lib "lib1/main.rkt")
-                        '(lib "lib2/main.rkt")))
-    (check-equal? (get-module-pkgs '(lib "lib1/main.rkt"))
-                  (list
-                   (pkg "p1" "http://a" "" "" "123" "")))
-
-    (set-pkg-dependencies! "p1" "http://a" "123" (list "p7"
-                                                       '("p8" "8.0")
-                                                       '("p9" #:version "9.0")
-                                                       '("p10" #:platform #rx"linux")
-                                                       '("p11" #:platform 'windows)
-                                                       '("p12" #:version "1.2" #:platform 'macosx)
-                                                       '("p13" #:platform 'unix #:version "1.3.2")
-                                                       '("p14" #:platform "")))
-    (check-equal? (sort (get-pkg-dependencies "p1" "http://a" "123")
-                        string<?
-                        #:key car)
-                  '(("p10" #:platform #rx"linux")
-                    ("p11" #:platform 'windows)
-                    ("p12" #:version "1.2" #:platform 'macosx)
-                    ("p13" #:version "1.3.2" #:platform 'unix)
-                    ("p14" #:platform "")
-                    ("p7")
-                    ("p8" #:version "8.0")
-                    ("p9" #:version "9.0")))
-
-    (set-catalogs! '("http://a" "http://c"))
-    (check-equal? (sort (get-catalogs) string<?) 
-                  '("http://a" "http://c"))
-
-    (check-equal? (get-pkgs) 
-                  (list
-                   (pkg "p1" "http://a" "github:a" "adam" "123" "the first package")))
-
-    (delete-file (current-pkg-catalog-file))
-
-    (void)))
diff --git a/racket/lib/collects/pkg/name.rkt b/racket/lib/collects/pkg/name.rkt
index a602a90f0f..996329fafb 100644
--- a/racket/lib/collects/pkg/name.rkt
+++ b/racket/lib/collects/pkg/name.rkt
@@ -106,8 +106,3 @@
 (define (package-source->name s)
   (define-values (name type) (package-source->name+type s #f))
   name)
-
-(module+ test
-  (require (submod "..") rackunit)
-  (check-equal? (package-source->name "http://")
-                #f))