Added findMacro() and test code