diff --git a/test-remove-complex-opera.scm b/test-remove-complex-opera.scm
index 3b5a75e..bf48f55 100644
--- a/test-remove-complex-opera.scm
+++ b/test-remove-complex-opera.scm
@@ -4,7 +4,7 @@
 (require "remove-complex-oper.scm")
 (require "c2.scm")
 
-(define programs 
+(define programs
   (list
    `(program ()
              (- 20))
@@ -28,9 +28,9 @@
              (let ([y (let ([x 20])
                         (+ x (let ([x 22]) x)))]) y))))
 
-(for/list ([program programs] [env (build-list (length programs) (lambda (_) '()))])
-     (test-eq ((interp-R1 env) program)
-              ((interp-R1 env) (remove-complex-opera* program))))
+(for ([program programs] [env (build-list (length programs) (lambda (_) '()))])
+  (test-eq ((interp-R1 env) program)
+           ((interp-R1 env) (remove-complex-opera* program))))
 
 (test-eq
   (remove-complex-opera* (list-ref programs 0))
@@ -59,7 +59,7 @@
 
 (test-eq
   (remove-complex-opera* (list-ref programs 6))
-  `(program () 
+  `(program ()
             (let ((x.1
                    (let ((tmp.1 (- 2)))
                      (+ tmp.1 3))))
@@ -69,9 +69,9 @@
 (test-eq
   (remove-complex-opera* (list-ref programs 7))
   `(program ()
-         (let ((x.1 
-                (let ((tmp.1 (- 1))) 
-                  (+ tmp.1 2)))) 
+         (let ((x.1
+                (let ((tmp.1 (- 1)))
+                  (+ tmp.1 2))))
            (let ((tmp.2 (+ x.1 2)))
              (let ((tmp.3 (+ 4 5)))
                (+ tmp.2 tmp.3))))))
@@ -79,7 +79,7 @@
 (test-eq
   (remove-complex-opera* (list-ref programs 8))
  `(program () (let([a.1 42]) (let ([b.1 a.1]) b.1))))
- 
+
 (test-eq
   (remove-complex-opera* (list-ref programs 9))
  `(program () (let ([tmp.1 (- 1)]) tmp.1)))
@@ -95,5 +95,3 @@
 (test-eq
   (remove-complex-opera* (list-ref programs 12))
   `(program () (let ((y.1 (let ((x.1 20)) (let ((x.2 22)) (+ x.1 x.2))))) y.1)))
-                   
-
diff --git a/test-uniquify.scm b/test-uniquify.scm
index df45c20..bd3ab5b 100644
--- a/test-uniquify.scm
+++ b/test-uniquify.scm
@@ -4,7 +4,7 @@
 (require "uniquify.scm")
 (require "c2.scm")
 
-(test-eq ((uniquify-exp (make-immutable-hash) (make-immutable-hash)) `(read)) 
+(test-eq ((uniquify-exp (make-immutable-hash) (make-immutable-hash)) `(read))
          `(#hash() (read)))
 (let ([tbl (hash-set (make-immutable-hash) `x 1)])
   (test-eq ((uniquify-exp tbl tbl) `x)
@@ -14,7 +14,7 @@
            `(#hash((x . 2)) (let ([x.2 2]) 3))))
 (test-eq ((uniquify-exp (make-immutable-hash) (make-immutable-hash)) `(let ([x 2]) (+ x 3)))
          `(#hash((x . 1)) (let ([x.1 2]) (+ x.1 3))))
-                 
+
 
 (test-eq (uniquify
            `(program ()
@@ -39,7 +39,7 @@
            `(program ()
               (let ([x 32])
                 (+ (let ([x 10]) x) (let ([x 3]) x) x))))
-         `(#hash((x . 3)) 
+         `(#hash((x . 3))
            (program ()
                     (let ([x.1 32])
                       (+ (let ([x.2 10]) x.2) (let ([x.3 3]) x.3) x.1)))))
@@ -59,15 +59,14 @@
            (let ([x 32])
              (+ (+ (let ([x 10]) x) (let ([x 3]) x)) x))))
 (define env1 '())
-  
+
 (define p2
         `(program ()
             (let ([x (let ([y 9])
                           y)])
               (+ x y))))
 (define env2 '((y 5)))
-  
-(for/list ([program (list p1 p2)] [env (list env1 env2)])
-     (test-eq ((interp-R1 env) program)
-              ((interp-R1 env) (cadr (uniquify program)))))
-     
+
+(for ([program (list p1 p2)] [env (list env1 env2)])
+   (test-eq ((interp-R1 env) program)
+            ((interp-R1 env) (cadr (uniquify program)))))
diff --git a/test-util.scm b/test-util.scm
index b907957..7dc43d0 100644
--- a/test-util.scm
+++ b/test-util.scm
@@ -1,8 +1,7 @@
 #lang racket
 
-(provide test-eq ppexp)
+(provide test-eq)
 
 (define (test-eq a b)
-   (if (equal? a b) #t (error "assert failed: " a " != " b)))
+   (if (equal? a b) (displayln "PASS") (error (format "FAIL: ~a != ~a" a  b))))
 
-(define (ppexp exp) (begin (print exp) (newline)))