Expand macroexpand.lisp
Change some things in the match function, update tests