replaced faulty test macros