WIP: change test syntax

Macros kill.