Add tests for LexicalTracker
Simplify current module macro handling