Added macros to run individual an spec