Merge "Checking menu item test to improve test fail diags"