Update test.lisp with the newer code from lispstrack.lisp