Main menu

Proposed restructuring of test: https://gist.github.com/emilesilvis/5c8edb64ebb46bee12d7. What do you think?