Improved test macros