Using updated test macros