Issue #162 - Test is no longer valid

Fixed a bug in the macro expander where the original environment of macro definition may not be used for part of the expansion.