diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.ss b/collects/tests/typed-scheme/unit-tests/all-tests.ss
index ec859fed..c32dbfea 100644
--- a/collects/tests/typed-scheme/unit-tests/all-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/all-tests.ss
@@ -3,15 +3,16 @@
 (require 
  "test-utils.ss"
  "planet-requires.ss"
- "typecheck-tests.ss"
- "subtype-tests.ss" ;; done
- "type-equal-tests.ss" ;; done
- "remove-intersect-tests.ss" ;; done
- "parse-type-tests.ss" ;; done
- "type-annotation-test.ss" ;; done
- "module-tests.ss"
- "subst-tests.ss"
- "infer-tests.ss")
+ ;"typecheck-tests.ss" ;; doesn't compile yet
+ "subtype-tests.ss" ;; fail
+ "type-equal-tests.ss" ;; pass
+ "remove-intersect-tests.ss" ;; pass
+ "parse-type-tests.ss" ;; pass
+ "type-annotation-test.ss" ;; fail
+ "module-tests.ss" ;; pass
+ "subst-tests.ss" ;; pass
+ "infer-tests.ss" ;; pass
+ )
 
 (require (r:infer infer infer-dummy)
          (schemeunit))
diff --git a/collects/tests/typed-scheme/unit-tests/infer-tests.ss b/collects/tests/typed-scheme/unit-tests/infer-tests.ss
index f792b1ef..8bcbd305 100644
--- a/collects/tests/typed-scheme/unit-tests/infer-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/infer-tests.ss
@@ -2,7 +2,7 @@
 (require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
 (require (rep type-rep)
 	 (r:infer infer)
-	 (private type-effect-convenience union type-utils)
+	 (types convenience union utils)
          (schemeunit))
 
 
diff --git a/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss b/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss
index cfe775ea..e509fbb7 100644
--- a/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss
@@ -3,14 +3,12 @@
 (require (utils tc-utils)
 	 (env type-alias-env type-environments type-name-env init-envs)
 	 (rep type-rep)
-	 (rename-in (private type-comparison parse-type subtype
-                             union type-utils)
-                    [Un t:Un])
-         (schemeunit))
-
-(require (rename-in (private type-effect-convenience) [-> t:->])
+	 (rename-in (types comparison subtype union utils convenience)
+                    [Un t:Un] [-> t:->])
          (private base-types base-types-extra)
-         (for-template (private base-types base-types-extra)))
+         (for-template (private base-types base-types-extra))
+         (private parse-type)
+         (schemeunit))
 
 (provide parse-type-tests)
 
diff --git a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss
index e18cd04b..53b99e22 100644
--- a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss
@@ -1,8 +1,8 @@
 #lang scheme/base
 (require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
 (require (rep type-rep)
-	 (r:infer infer)
-	 (private type-effect-convenience remove-intersect subtype union)
+	 (r:infer infer infer-dummy)
+         (types convenience subtype union remove-intersect)
          (schemeunit))
 
 (define-syntax (restr-tests stx)    
@@ -11,6 +11,8 @@
      #'(test-suite "Tests for intersect"
                    (test-check (format "Restrict test: ~a ~a" t1 t2) type-compare? (restrict t1 t2) res) ...)]))
 
+(infer-param infer)
+
 (define (restrict-tests) 
   (restr-tests
    [N (Un N Sym) N]
diff --git a/collects/tests/typed-scheme/unit-tests/subst-tests.ss b/collects/tests/typed-scheme/unit-tests/subst-tests.ss
index 6ac1db6f..02a018c7 100644
--- a/collects/tests/typed-scheme/unit-tests/subst-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/subst-tests.ss
@@ -2,7 +2,7 @@
 
 (require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
 (require (rep type-rep)
-	 (types type-utils type-abbrev)
+	 (types utils abbrev)
          (schemeunit))
 
 (define-syntax-rule (s img var tgt result)
diff --git a/collects/tests/typed-scheme/unit-tests/subtype-tests.ss b/collects/tests/typed-scheme/unit-tests/subtype-tests.ss
index 719f108b..ff8a3b3a 100644
--- a/collects/tests/typed-scheme/unit-tests/subtype-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/subtype-tests.ss
@@ -2,7 +2,7 @@
 
 (require "test-utils.ss" "planet-requires.ss")
 
-(require (types subtype type-effect-convenience union)
+(require (types subtype convenience union)
 	 (rep type-rep)
 	 (env init-envs type-environments)
 	 (r:infer infer infer-dummy)
@@ -55,7 +55,7 @@
    [(-mu x (Un N (make-Listof x))) (-mu x (Un N Sym (make-Listof x)))]
    [(-mu x (Un N (make-Listof x))) (-mu y (Un N Sym (make-Listof y)))]
    ;; a hard one
-   [-NE -Sexp]
+   [(-mu x (*Un N (-pair x (-pair Sym (-pair x (-val null)))))) -Sexp]
    ;; simple function types
    ((Univ . -> . N) (N . -> . Univ))
    [(Univ Univ Univ . -> . N) (Univ Univ N . -> . N)]