Macros review and tests added