Changes to test.lisp