diff --git a/collects/tests/macro-debugger/tests/collects.rkt b/collects/tests/macro-debugger/tests/collects.rkt
index 955e28b..312f512 100644
--- a/collects/tests/macro-debugger/tests/collects.rkt
+++ b/collects/tests/macro-debugger/tests/collects.rkt
@@ -66,8 +66,12 @@
      (apply omnr args)]))
 
 (define (rel+mod->mod rel mod)
-  (define-values (base file dir?) (split-path (resolved-module-path-name rel)))
-  (path->mod (simplify-path (build-path base mod))))
+  (let* ([rel (resolved-module-path-name rel)]
+         [rel (if (pair? rel) (car rel) rel)])
+    (if (pair? mod)
+        #f  ;; give up on submodules for now; FIXME
+        (let-values ([(base file dir?) (split-path rel)])
+          (path->mod (simplify-path (build-path base mod)))))))
 
 (define (path->mod path)
   (cond [(for/or ([c (current-library-collection-paths)]) (path->mod* path c))
diff --git a/collects/tests/macro-debugger/tests/policy.rkt b/collects/tests/macro-debugger/tests/policy.rkt
index b589598..3920680 100644
--- a/collects/tests/macro-debugger/tests/policy.rkt
+++ b/collects/tests/macro-debugger/tests/policy.rkt
@@ -38,7 +38,7 @@
 
       ;; Other racket/* forms
       (test-base scheme:match #f)
-      (test-base scheme:unit #t)
+      (test-base scheme:unit #f)
       (test-base scheme:class #f)
 
       ;; Unbound names