Macro Testing / Behavoir

Making macros work in more situations.