Additional test for invalid menu option
Fix up tests for invalid menu options
Fix check for invalid main menu option