Added testing code for macros …