CA-242134: Fix some tests after the removal of ClearwaterOrGreater usages

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

XenAdminTests/DialogTests/PropertiesDialogTest.cs

@@ -160,7 +160,7 @@ namespace XenAdminTests.DialogTests.state1_xml.PropertiesDialogTests
     public class PropertiesDialogTest_SR : VerticallyTabbedDialogTest<PropertiesDialog>
     {
         public PropertiesDialogTest_SR()
-            : base(new string[] { "General", "Custom Fields" })
+            : base(new string[] { "General", "Custom Fields", "Alerts" })
         { }
 
         protected override PropertiesDialog NewDialog()

XenAdminTests/TabsAndMenus/MainMenuGeorge.cs

@@ -1583,6 +1583,8 @@ namespace XenAdminTests.TabsAndMenus
         }
 
         [Test]
+        [Ignore("Ignore, as it currently fails because some additional members are added to the VMTooltripMenuItem on a separate thread (MigrateVMToolStripMenuItem.AddAdditionalMenuItems)." +
+                " Same problem as with ContextMenu_VMWithTools,see CA-123967.")]
         public void MainMenu_VMWithTools()
         {
             foreach (VM vm in GetAllXenObjects<VM>(HasTools))
@@ -1668,6 +1670,8 @@ namespace XenAdminTests.TabsAndMenus
                                          residentOnInflames
                                              ? new ExpectedTextMenuItem("incubus (INTERNAL_ERROR)", false, false, true)
                                              : new ExpectedTextMenuItem("incubus (Current server)", false, false, true),
+                                         new ExpectedSeparator(),
+                                         new ExpectedTextMenuItem("&Migrate VM wizard...", false, false)
                                      }),
                             new ExpectedSeparator(),
                             new ExpectedTextMenuItem("Assign to VM Protection Polic&y", false, false),