Tests for the key macro
Fix and tests for the menu macro