Added macro environment unit test that tests for bug "inconsistent expansion of local...