core tests all pass again after moving macros to macros.clj