Modifying tests for menu
Refactoring some of the messages that are displayed