Fix unit tests
Merge pull request #2702 from adobe/glenn/menu-unit-tests

Fix unit tests