Fix test macros