Rename macro

* Add functional Test
I'd name it "testDynamicHierarchyMacro" or just "dynamicHierarchyMacro"