Update test.lisp with the newer definitions