fixup untyped macro tests