diff --git a/collects/tests/typed-scheme/succeed/batched-queue.scm b/collects/tests/typed-scheme/succeed/batched-queue.scm
index 71e1db34..7c2ae9e9 100644
--- a/collects/tests/typed-scheme/succeed/batched-queue.scm
+++ b/collects/tests/typed-scheme/succeed/batched-queue.scm
@@ -82,5 +82,5 @@
 
 ;; TESTS
 
-(= 0 (size (empty)))
+(= 0 (size ((inst empty Number))))
 
diff --git a/collects/tests/typed-scheme/succeed/unholy-terror.ss b/collects/tests/typed-scheme/succeed/unholy-terror.ss
index 93aa200f..34aaa19b 100644
--- a/collects/tests/typed-scheme/succeed/unholy-terror.ss
+++ b/collects/tests/typed-scheme/succeed/unholy-terror.ss
@@ -1,6 +1,6 @@
 #lang typed-scheme
 
-#;
+
 (apply (plambda: (a ...) [ys : (a ... a -> Number) *]
          (lambda: [zs : a ... a]
             (map (lambda: ([y : (a ... a -> Number)])
@@ -10,7 +10,7 @@
              (lambda: ([x : Number] [y : Number]) (- x y))
              (lambda: ([x : Number] [y : Number]) (* x y))
              (lambda: ([x : Number] [y : Number]) (/ x y))))
-#;
+
 ((apply (plambda: (a ...) [ys : (a ... a -> Number) *]
           (lambda: [zs : a ... a]
             (map (lambda: ([y : (a ... a -> Number)])
@@ -22,6 +22,12 @@
               (lambda: ([x : Number] [y : Number]) (/ x y))))
  3 4)
 
+(plambda: (a ...) [ys : (a ... a -> Number) *]
+          ((inst map Number (a ... a -> Number)) (ann (error 'fail) ((a ... a -> Number) -> Number)) ys))
+
+(plambda: (a ...) [ys : (a ... a -> Number) *]
+          (map (ann (error 'fail) ((a ... a -> Number) -> Number)) ys))
+
 (apply (plambda: (a ...) [ys : (a ... a -> Number) *]
          (lambda: [zs : a ... a]
                   (map (lambda: ([y : (a ... a -> Number)])
diff --git a/collects/tests/typed-scheme/unit-tests/infer-tests.ss b/collects/tests/typed-scheme/unit-tests/infer-tests.ss
index 46a30545..f1d5e22b 100644
--- a/collects/tests/typed-scheme/unit-tests/infer-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/infer-tests.ss
@@ -32,16 +32,16 @@
 (define-syntax-rule (i2-t t1 t2 (a b) ...)
   (test-check (format "~a ~a" t1 t2)
               equal?
-              (infer t1 t2 (fv t1))
+              (infer t1 t2 (fv t1) (fv t1))
               (list (list a b) ...)))
 
 (define-syntax-rule (i2-l t1 t2 fv (a b) ...)
   (test-check (format "~a ~a" t1 t2)
               equal?
-              (infer/list t1 t2 fv)
+              (infer/list t1 t2 fv fv)
               (list (list a b) ...)))
 
-(define (f t1 t2) (infer t1 t2 (fv t1)))
+(define (f t1 t2) (infer t1 t2 (fv t1) (fv t1)))
 
 (define-syntax-rule (i2-f t1 t2)
   (test-false (format "~a ~a" t1 t2)