Adding Macro support to tests