Refactor.
Expanded test for menu command layouts in menu