merlin: simple tests passing, only macros remain