diff --git a/TODO b/TODO
index e3c644d1..58fb23d0 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,8 @@ Working TODO list:
  - Error handling
    need to perform much more error handling of input code. one of the biggest is to report if a function is passed the wrong number of arguments, as this will result in segfauls, bad transport errors, etc downstream if it is allowed.
 
+ - Add unit tests for exception handlers, and new constructs added to lib
+
  - Reduction in size of generated code
    is there anything we can do?
    are closures being packed/unpacked unnecessarily?
diff --git a/test.scm b/test.scm
index c010f727..98eada79 100644
--- a/test.scm
+++ b/test.scm
@@ -1,34 +1,4 @@
 ;;; Temporary testing, delete this once it works
-;(define (call2 fn x y)
-;  (write
-;    (fn x y)))
-;
-;(define (call fn a)
-; (fn a))
-;
-;(call write 'hello)
-;
-;;; Demonstrate sending an interpreted function to compiled code
-;;; I think in order for this to work, the compiled code would have to
-;;; detect an interpreted proc, and use eval to execute it
-;
-;;; TODO: to debug this, may try placing printfs in runtime's apply
-;(eval '(call2 (lambda (x y) (+ y x)) 2 3))
-;;(eval '(call (lambda (x) (+ 1 x)) (display (+ 1 1))))
-;;(eval '(call write 1))
-;;(eval '(call mywrite 1))
-;
-;(eval '(define (a x) x))
-;(eval '(a 1))
-;(eval '(a 1))
-;(eval '(begin (define (a z) z) (a 1) (a 1)))
-
-; TODO: demonstrates problem of using call/cc within a global.
-; all globals are created with a k parameter, EG:
-; ((lambda (call/cc)
-;    (define test
-;      (lambda (k$104)
-;
 ; Need to rewrite the code to use this, and preserve the global def
 (define (test)
   (call/cc
@@ -36,39 +6,39 @@
       (return #t))))
 (write (test))
 
-;(write
-;  (with-exception-handler
-;    (lambda (con)
-;      (cond
-;        ((string? con)
-;         (display con))
-;        (else
-;         (display "a warning has been issued")))
-;      42)
-;    (lambda ()
-;      (+ (raise-continuable "should be a number") 23)
-;      )))
-;;prints: should be a number
-;;=> 65
-;
-;(write
-;  (call/cc
-;    (lambda (k)
-;      (with-exception-handler
-;        (lambda (x)
-;          (display "condition: ")
-;          (write x)
-;          ;(newline)
-;          (k 'exception))
-;        (lambda ()
-;          (+ 1 (raise 'an-error)))))))
-;
-;(with-exception-handler
-;    (lambda (x)
-;        (display "something went wrong\n"))
-;    (lambda ()
-;        (+ 1 (raise 'an-error))))
-;
+(write
+  (with-exception-handler
+    (lambda (con)
+      (cond
+        ((string? con)
+         (display con))
+        (else
+         (display "a warning has been issued")))
+      42)
+    (lambda ()
+      (+ (raise-continuable "should be a number") 23)
+      )))
+;prints: should be a number
+;=> 65
+
+(write
+  (call/cc
+    (lambda (k)
+      (with-exception-handler
+        (lambda (x)
+          (display "condition: ")
+          (write x)
+          ;(newline)
+          (k 'exception))
+        (lambda ()
+          (+ 1 (raise 'an-error)))))))
+
+(with-exception-handler
+    (lambda (x)
+        (display "something went wrong\n"))
+    (lambda ()
+        (+ 1 (raise 'an-error))))
+
 ;(define test '(a b))
 ;(set-car! test '(1 2 3))
 ;(write test)