diff --git a/collects/tests/typed-scheme/unit-tests/planet-requires.ss b/collects/tests/typed-scheme/unit-tests/planet-requires.ss
index 038b3fb17e..96b80f4ee2 100644
--- a/collects/tests/typed-scheme/unit-tests/planet-requires.ss
+++ b/collects/tests/typed-scheme/unit-tests/planet-requires.ss
@@ -9,28 +9,11 @@
 
 (define-syntax define-module
   (syntax-rules ()
-    [(_ nm spec ...)
-     
+    [(_ nm spec ...)     
      (define-syntax nm
        (make-require-transformer
         (lambda (stx)
-          (splice-requires (list (syntax-local-introduce (quote-syntax spec)) ...)))))
-     #;
-     (define-require-syntax nm
-       (lambda (stx) 
-         (syntax-case stx ()
-           [(_) (datum->syntax stx (syntax->datum #'(combine-in spec ...)))])))]))
-
-#;
-(define-syntax define-module
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nm spec ...)
-       (syntax/loc stx
-         (define-syntax nm
-           (make-require-transformer
-            (lambda (stx)
-              (splice-requires (list (syntax-local-introduce (quote-syntax spec)) ...))))))])))
+          (splice-requires (list (syntax-local-introduce (quote-syntax spec)) ...)))))]))
 
 (define-syntax planet/multiple
   (make-require-transformer
diff --git a/collects/tests/typed-scheme/unit-tests/subst-tests.ss b/collects/tests/typed-scheme/unit-tests/subst-tests.ss
index 91d42cd426..6ac1db6fb3 100644
--- a/collects/tests/typed-scheme/unit-tests/subst-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/subst-tests.ss
@@ -2,14 +2,14 @@
 
 (require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
 (require (rep type-rep)
-	 (private type-utils type-effect-convenience)
+	 (types type-utils type-abbrev)
          (schemeunit))
 
 (define-syntax-rule (s img var tgt result)
   (test-eq? "test" (substitute img 'var tgt) result))
 
 (define-syntax-rule (s... imgs var tgt result)
-  (test-eq? "test" (substitute-dots (list . imgs) 'var tgt) result))
+  (test-eq? "test" (substitute-dots (list . imgs) #f 'var tgt) result))
 
 (define (subst-tests)
   (test-suite "Tests for substitution"
diff --git a/collects/tests/typed-scheme/unit-tests/test-utils.ss b/collects/tests/typed-scheme/unit-tests/test-utils.ss
index 9c40943939..c520cebdc0 100644
--- a/collects/tests/typed-scheme/unit-tests/test-utils.ss
+++ b/collects/tests/typed-scheme/unit-tests/test-utils.ss
@@ -8,9 +8,10 @@
          (for-syntax scheme/base))
 
 
-(require (private type-comparison type-utils)
+(require (types comparison type-utils)
          (schemeunit))
-(provide private typecheck (rename-out [infer r:infer]) utils env rep)
+
+(provide private typecheck (rename-out [infer r:infer]) utils env rep types)
 
 (define (mk-suite ts)
   (match (map (lambda (f) (f)) ts)
@@ -38,13 +39,9 @@
 	    (values (lambda () (run tmps ...))
 		    (lambda () (run/gui tmps ...))))))]))
 
-;; FIXME - check that effects are equal
+;; FIXME - do something more intelligent
 (define (tc-result-equal/test? a b)
-  (match* (a b)
-          [((tc-result: t1 thn1 els1) (tc-result: t2 thn2 els2))
-           (and (type-equal? t1 t2)
-                (= (length thn1) (length thn2))
-                (= (length els1) (length els2)))]))
+  (equal? a b))
 
 (define-syntax (check-type-equal? stx)
   (syntax-case stx ()