Reorganize test and benchmark macros