Updated all tests according to new menu
and added few tests