fix macro writing macro.  note to self, stop writing these
Fixed up e2e test