changing the way the menu is being handled and reflecting those changes on the tests