Added some macros and testing
Created shared macro file