diff --git a/collects/tests/mzscheme/unit.ss b/collects/tests/mzscheme/unit.ss
index a6f5440..e9bb664 100644
--- a/collects/tests/mzscheme/unit.ss
+++ b/collects/tests/mzscheme/unit.ss
@@ -250,15 +250,6 @@
 (define z1 (make-z 8))
 (define z2 (make-z 7))
 
-(define m3
-  (compound-unit
-   (import)
-   (link [Z1 (z1 (Z2 z))][Z2 (z2 (Z1 z))])
-   (export [Z1 (y y1) (z x1)][Z2 (y y2) (z x2)])))
-
-(invoke-open-unit m3)
-(test '(-1 1 8 7) 'invoke-open-unit (list (y1) (y2) x1 x2))
-
 ; Dynamic linking
 
 (let ([u
@@ -277,42 +268,6 @@
 
 		      (invoke-unit u w)))))
 
-; Linking environemtns
-
-(if (defined? 'x)
-    (undefine 'x))
-
-(define (make--eval)
-  (let ([n (make-namespace)])
-    (lambda (e)
-      (let ([orig (current-namespace)])
-	(dynamic-wind
-	 (lambda () (current-namespace n))
-	 (lambda () (eval e))
-	 (lambda () (current-namespace orig)))))))
-
-(define u
-  (unit
-   (import)
-   (export x)
-   (define x 5)))
-(define e (make--eval))
-(e (list 'invoke-open-unit u #f))
-(test #f defined? 'x)
-(test #t e '(defined? 'x))
-
-(define u2
-  (let ([u u])
-    (unit
-     (import)
-     (export)
-     (invoke-open-unit u #f))))
-(define e (make--eval))
-(e (list 'invoke-open-unit u2 #f))
-(test #f defined? 'x)
-(test #t e '(defined? 'x))
-
-
 ; Misc
 
 (test 12 'nested-units
@@ -507,7 +462,7 @@
 	       (define b 'nested-b)
 	       (list b w a c))
 	     a b)
-	    (invoke-open-unit
+	    (invoke-unit
 	      (compound-unit
 	       (import a)
 	       (link [u ((unit (import c) (export (xa a) (b xb))
@@ -516,7 +471,6 @@
 			       (list a b c))
 			 a)])
 	       (export))
-	      #f
 	      b)
 	    (send
 	     (make-object
diff --git a/collects/tests/mzscheme/unitsig.ss b/collects/tests/mzscheme/unitsig.ss
index b87e9f1..7cbf23a 100644
--- a/collects/tests/mzscheme/unitsig.ss
+++ b/collects/tests/mzscheme/unitsig.ss
@@ -391,21 +391,6 @@
 			a@)])
 	(export))))
 
-; Export var from embedded unit:
-
-(define-signature e ((unit w : (embedded-v))))
-(invoke-open-unit/sig
- (compound-unit/sig
-  (import)
-  (link [E : e ((compound-unit/sig
-		 (import)
-		 (link [w : (embedded-v) ((unit/sig (embedded-v)
-						    (import)
-						    (define embedded-v 0)))])
-		 (export (unit w))))])
-  (export (var ((E w) embedded-v)))))
-(test 0 'embedded-v embedded-v)
-
 ; Signature ordering
 
 (define o1 (unit/sig (num sym) (import) (define num 5) (define sym 'a)))