Improved macros for more general testing syntax