iOS test creation of menu item and adding/retrieving from menu list. Fixing merge issues (and my own stupidity)