Refactor basic LISP tests

No match.