refactors macro tests

putting in a nutshell, this patch:
  * condenses some macro-XXX-a/b/c/... bundles
  * renames some tests to prepare for type macros
  * introduces some additional tests
fixup untyped macro tests
fixup refactor tests
fixup refactor tests
fixup untyped macros