diff --git a/src/common/UITestAutomation/Element/By.cs b/src/common/UITestAutomation/Element/By.cs
index 2e4814accde5..b2d8ecf6c449 100644
--- a/src/common/UITestAutomation/Element/By.cs
+++ b/src/common/UITestAutomation/Element/By.cs
@@ -11,17 +11,40 @@ namespace Microsoft.PowerToys.UITest
     /// </summary>
     public class By
     {
-        private readonly OpenQA.Selenium.By by;
+        private readonly OpenQA.Selenium.By? by;
+        private readonly bool isAccessibilityId;
+        private readonly string? accessibilityId;
 
         private By(OpenQA.Selenium.By by)
         {
+            isAccessibilityId = false;
             this.by = by;
         }
 
+        private By(string accessibilityId)
+        {
+            isAccessibilityId = true;
+            this.accessibilityId = accessibilityId;
+        }
+
         public override string ToString()
         {
             // override ToString to return detailed debugging content provided by OpenQA.Selenium.By
-            return this.by.ToString();
+            return this.GetAccessibilityId();
+        }
+
+        public bool GetIsAccessibilityId() => this.isAccessibilityId;
+
+        public string GetAccessibilityId()
+        {
+            if (this.isAccessibilityId)
+            {
+                return this.accessibilityId!;
+            }
+            else
+            {
+                return this.by!.ToString();
+            }
         }
 
         /// <summary>
@@ -45,6 +68,13 @@ public override string ToString()
         /// <returns>A By object.</returns>
         public static By Id(string id) => new By(OpenQA.Selenium.By.Id(id));
 
+        /// <summary>
+        /// Creates a By object using the ID attribute.
+        /// </summary>
+        /// <param name="accessibilityId">The ID attribute to search for.</param>
+        /// <returns>A By object.</returns>
+        public static By AccessibilityId(string accessibilityId) => new By(accessibilityId);
+
         /// <summary>
         /// Creates a By object using the XPath expression.
         /// </summary>
@@ -77,6 +107,6 @@ public override string ToString()
         /// Converts the By object to an OpenQA.Selenium.By object.
         /// </summary>
         /// <returns>An OpenQA.Selenium.By object.</returns>
-        internal OpenQA.Selenium.By ToSeleniumBy() => by;
+        internal OpenQA.Selenium.By ToSeleniumBy() => by!;
     }
 }
diff --git a/src/common/UITestAutomation/Element/Element.cs b/src/common/UITestAutomation/Element/Element.cs
index 70bdc690c08e..7ca0cf53a5b5 100644
--- a/src/common/UITestAutomation/Element/Element.cs
+++ b/src/common/UITestAutomation/Element/Element.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Xml.Linq;
 using ABI.Windows.Foundation;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
@@ -192,7 +193,10 @@ public void Drag(Element element)
         /// <param name="key">The Key to Send.</param>
         public void SendKeys(string key)
         {
-            windowsElement?.SendKeys(key);
+            PerformAction((actions, windowElement) =>
+            {
+                windowElement.SendKeys(key);
+            });
         }
 
         /// <summary>
@@ -241,26 +245,6 @@ public T Find<T>(string name, int timeoutMS = 3000)
             return this.Find<T>(By.Name(name), timeoutMS);
         }
 
-        /// <summary>
-        /// Shortcut for this.FindAllByAccessibilityId<T>(accessibilityId, timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="accessibilityId">The accessibilityId of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        public T FindByAccessibilityId<T>(string accessibilityId, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: accessibilityId = {accessibilityId}, timeoutMS = {timeoutMS}");
-
-            // leverage findAll to filter out mismatched elements
-            var collection = this.FindAllByAccessibilityId<T>(accessibilityId, timeoutMS);
-
-            Assert.IsTrue(collection.Count > 0, $"Element not found using selector: {accessibilityId}");
-
-            return collection[0];
-        }
-
         /// <summary>
         /// Finds an element by the selector.
         /// Shortcut for this.Find<Element>(by, timeoutMS)
@@ -299,31 +283,16 @@ public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
             var foundElements = FindHelper.FindAll<T, AppiumWebElement>(
                 () =>
                 {
-                    var elements = this.windowsElement.FindElements(by.ToSeleniumBy());
-                    return elements;
-                },
-                this.driver,
-                timeoutMS);
-
-            return foundElements ?? new ReadOnlyCollection<T>([]);
-        }
-
-        /// <summary>
-        /// Finds all elements by accessibilityId.
-        /// </summary>
-        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
-        /// <param name="accessibilityId">The accessibilityId to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAllByAccessibilityId<T>(string accessibilityId, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: accessibilityId = {accessibilityId}, timeoutMS = {timeoutMS}");
-            var foundElements = FindHelper.FindAll<T, AppiumWebElement>(
-                () =>
-                {
-                    var elements = this.windowsElement.FindElementsByAccessibilityId(accessibilityId);
-                    return elements;
+                    if (by.GetIsAccessibilityId())
+                    {
+                        var elements = this.windowsElement.FindElementsByAccessibilityId(by.GetAccessibilityId());
+                        return elements;
+                    }
+                    else
+                    {
+                        var elements = this.windowsElement.FindElements(by.ToSeleniumBy());
+                        return elements;
+                    }
                 },
                 this.driver,
                 timeoutMS);
diff --git a/src/common/UITestAutomation/Session.cs b/src/common/UITestAutomation/Session.cs
index f4b5535ae10d..9e5101fc759e 100644
--- a/src/common/UITestAutomation/Session.cs
+++ b/src/common/UITestAutomation/Session.cs
@@ -8,6 +8,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Interactions;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -62,26 +63,6 @@ public T Find<T>(string name, int timeoutMS = 3000)
             return this.Find<T>(By.Name(name), timeoutMS);
         }
 
-        /// <summary>
-        /// Shortcut for this.FindAllByAccessibilityId<T>(accessibilityId, timeoutMS)
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="accessibilityId">The accessibilityId of the element.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>The found element.</returns>
-        public T FindByAccessibilityId<T>(string accessibilityId, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: accessibilityId = {accessibilityId}, timeoutMS = {timeoutMS}");
-
-            // leverage findAll to filter out mismatched elements
-            var collection = this.FindAllByAccessibilityId<T>(accessibilityId, timeoutMS);
-
-            Assert.IsTrue(collection.Count > 0, $"Element not found using selector: {accessibilityId}");
-
-            return collection[0];
-        }
-
         /// <summary>
         /// Shortcut for this.Find<Element>(by, timeoutMS)
         /// </summary>
@@ -118,31 +99,16 @@ public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 3000)
             var foundElements = FindHelper.FindAll<T, WindowsElement>(
                 () =>
                 {
-                    var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
-                    return elements;
-                },
-                this.WindowsDriver,
-                timeoutMS);
-
-            return foundElements ?? new ReadOnlyCollection<T>([]);
-        }
-
-        /// <summary>
-        /// Finds all elements by accessibilityId.
-        /// </summary>
-        /// <typeparam name="T">The class of the elements, should be Element or its derived class.</typeparam>
-        /// <param name="accessibilityId">The accessibilityId to find the elements.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 3000).</param>
-        /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAllByAccessibilityId<T>(string accessibilityId, int timeoutMS = 3000)
-            where T : Element, new()
-        {
-            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: accessibilityId = {accessibilityId}, timeoutMS = {timeoutMS}");
-            var foundElements = FindHelper.FindAll<T, WindowsElement>(
-                () =>
-                {
-                    var elements = this.WindowsDriver.FindElementsByAccessibilityId(accessibilityId);
-                    return elements;
+                    if (by.GetIsAccessibilityId())
+                    {
+                        var elements = this.WindowsDriver.FindElementsByAccessibilityId(by.GetAccessibilityId());
+                        return elements;
+                    }
+                    else
+                    {
+                        var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
+                        return elements;
+                    }
                 },
                 this.WindowsDriver,
                 timeoutMS);
@@ -188,6 +154,39 @@ public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 3000)
             return this.FindAll<Element>(By.Name(name), timeoutMS);
         }
 
+        /// <summary>
+        /// Keyboard Action key.
+        /// </summary>
+        /// <param name="key1">The Keys1 to click.</param>
+        /// <param name="key2">The Keys2 to click.</param>
+        /// <param name="key3">The Keys3 to click.</param>
+        /// <param name="key4">The Keys4 to click.</param>
+        public void KeyboardAction(string key1, string key2 = "", string key3 = "", string key4 = "")
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                if (string.IsNullOrEmpty(key2))
+                {
+                    actions.SendKeys(key1);
+                }
+                else if (string.IsNullOrEmpty(key3))
+                {
+                    actions.SendKeys(key1).SendKeys(key2);
+                }
+                else if (string.IsNullOrEmpty(key4))
+                {
+                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3);
+                }
+                else
+                {
+                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3).SendKeys(key4);
+                }
+
+                actions.Release();
+                actions.Build().Perform();
+            });
+        }
+
         /// <summary>
         /// Attaches to an existing PowerToys module.
         /// </summary>
@@ -232,5 +231,28 @@ public Session Attach(string windowName)
 
             return this;
         }
+
+        /// <summary>
+        /// Simulates a manual operation on the element.
+        /// </summary>
+        /// <param name="action">The action to perform on the element.</param>
+        /// <param name="msPreAction">The number of milliseconds to wait before the action. Default value is 500 ms</param>
+        /// <param name="msPostAction">The number of milliseconds to wait after the action. Default value is 500 ms</param>
+        protected void PerformAction(Action<Actions, WindowsDriver<WindowsElement>> action, int msPreAction = 500, int msPostAction = 500)
+        {
+            if (msPreAction > 0)
+            {
+                Task.Delay(msPreAction).Wait();
+            }
+
+            var windowsDriver = this.WindowsDriver;
+            Actions actions = new Actions(this.WindowsDriver);
+            action(actions, windowsDriver);
+
+            if (msPostAction > 0)
+            {
+                Task.Delay(msPostAction).Wait();
+            }
+        }
     }
 }
diff --git a/src/common/UITestAutomation/UITestBase.cs b/src/common/UITestAutomation/UITestBase.cs
index d9887708289e..1fb37468ff2a 100644
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -52,9 +52,10 @@ public void TestInit()
         /// <summary>
         /// UnInitializes the test.
         /// </summary>
+        [TestCleanup]
         public void TestClean()
         {
-            this.sessionHelper.Cleanup();
+            // this.sessionHelper.Cleanup();
         }
 
         /// <summary>
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
index 4f95b4712e7a..06c06d53e289 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
@@ -64,27 +64,21 @@ public DefaultLayoutsTest()
             FancyZonesEditorHelper.Files.ParamsIOHelper.WriteData(editorParameters.Serialize(parameters));
         }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            this.TestClean();
-        }
-
         [TestMethod]
         public void ClickMonitor()
         {
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 1"));
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 2"));
+            Assert.IsNotNull(Session.Find<Element>("Monitor 1"));
+            Assert.IsNotNull(Session.Find<Element>("Monitor 2"));
 
             // verify that the monitor 1 is selected initially
-            Assert.IsTrue(Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 1").Selected);
-            Assert.IsFalse(Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 2").Selected);
+            Assert.IsTrue(Session.Find<Element>("Monitor 1").Selected);
+            Assert.IsFalse(Session.Find<Element>("Monitor 2").Selected);
 
-            Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 2").Click();
+            Session.Find<Element>("Monitor 2").Click();
 
             // verify that the monitor 2 is selected after click
-            Assert.IsFalse(Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 1").Selected);
-            Assert.IsTrue(Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 2").Selected);
+            Assert.IsFalse(Session.Find<Element>("Monitor 1").Selected);
+            Assert.IsTrue(Session.Find<Element>("Monitor 2").Selected);
         }
     }
 }
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs
new file mode 100644
index 000000000000..4d24dc4045c4
--- /dev/null
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs
@@ -0,0 +1,356 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using FancyZonesEditor.Models;
+using FancyZonesEditorCommon.Data;
+using Microsoft.FancyZonesEditor.UnitTests.Utils;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ModernWpf.Controls;
+using OpenQA.Selenium;
+using static FancyZonesEditorCommon.Data.CustomLayouts;
+using static FancyZonesEditorCommon.Data.DefaultLayouts;
+using static FancyZonesEditorCommon.Data.EditorParameters;
+using static FancyZonesEditorCommon.Data.LayoutHotkeys;
+using static Microsoft.FancyZonesEditor.UnitTests.Utils.FancyZonesEditorHelper;
+
+namespace Microsoft.FancyZonesEditor.UITests
+{
+    [TestClass]
+    public class DeleteLayoutTests : UITestBase
+    {
+        public DeleteLayoutTests()
+            : base(PowerToysModule.FancyZone)
+        {
+        }
+
+        private static readonly CustomLayoutListWrapper CustomLayouts = new CustomLayoutListWrapper
+        {
+            CustomLayouts = new List<CustomLayoutWrapper>
+            {
+                new CustomLayoutWrapper
+                {
+                    Uuid = "{0D6D2F58-9184-4804-81E4-4E4CC3476DC1}",
+                    Type = CustomLayout.Grid.TypeToString(),
+                    Name = "Custom layout 1",
+                    Info = new CustomLayouts().ToJsonElement(new CustomLayouts.GridInfoWrapper
+                    {
+                        Rows = 2,
+                        Columns = 3,
+                        RowsPercentage = new List<int> { 2967, 7033 },
+                        ColumnsPercentage = new List<int> { 2410, 6040, 1550 },
+                        CellChildMap = new int[][] { [0, 1, 1], [0, 2, 3] },
+                        SensitivityRadius = 30,
+                        Spacing = 26,
+                        ShowSpacing = false,
+                    }),
+                },
+                new CustomLayoutWrapper
+                {
+                    Uuid = "{E7807D0D-6223-4883-B15B-1F3883944C09}",
+                    Type = CustomLayout.Canvas.TypeToString(),
+                    Name = "Custom layout 2",
+                    Info = new CustomLayouts().ToJsonElement(new CanvasInfoWrapper
+                    {
+                        RefHeight = 952,
+                        RefWidth = 1500,
+                        SensitivityRadius = 10,
+                        Zones = new List<CanvasInfoWrapper.CanvasZoneWrapper>
+                        {
+                            new CanvasInfoWrapper.CanvasZoneWrapper
+                            {
+                                X = 0,
+                                Y = 0,
+                                Width = 900,
+                                Height = 522,
+                            },
+                            new CanvasInfoWrapper.CanvasZoneWrapper
+                            {
+                                X = 900,
+                                Y = 0,
+                                Width = 600,
+                                Height = 750,
+                            },
+                            new CanvasInfoWrapper.CanvasZoneWrapper
+                            {
+                                X = 0,
+                                Y = 522,
+                                Width = 1500,
+                                Height = 430,
+                            },
+                        },
+                    }),
+                },
+            },
+        };
+
+        private static readonly DefaultLayouts.DefaultLayoutsListWrapper DefaultLayoutsList = new DefaultLayouts.DefaultLayoutsListWrapper
+        {
+            DefaultLayouts = new List<DefaultLayouts.DefaultLayoutWrapper>
+            {
+                new DefaultLayoutWrapper
+                {
+                    MonitorConfiguration = MonitorConfigurationType.Horizontal.TypeToString(),
+                    Layout = new DefaultLayoutWrapper.LayoutWrapper
+                    {
+                        Type = LayoutType.Custom.TypeToString(),
+                        Uuid = CustomLayouts.CustomLayouts[1].Uuid,
+                    },
+                },
+            },
+        };
+
+        private static readonly LayoutHotkeys.LayoutHotkeysWrapper Hotkeys = new LayoutHotkeys.LayoutHotkeysWrapper
+        {
+            LayoutHotkeys = new List<LayoutHotkeys.LayoutHotkeyWrapper>
+            {
+                new LayoutHotkeyWrapper
+                {
+                    LayoutId = CustomLayouts.CustomLayouts[1].Uuid,
+                    Key = 0,
+                },
+            },
+        };
+
+        private static readonly ParamsWrapper Parameters = new ParamsWrapper
+        {
+            ProcessId = 1,
+            SpanZonesAcrossMonitors = false,
+            Monitors = new List<NativeMonitorDataWrapper>
+            {
+                new NativeMonitorDataWrapper
+                {
+                    Monitor = "monitor-1",
+                    MonitorInstanceId = "instance-id-1",
+                    MonitorSerialNumber = "serial-number-1",
+                    MonitorNumber = 1,
+                    VirtualDesktop = "{FF34D993-73F3-4B8C-AA03-73730A01D6A8}",
+                    Dpi = 192,
+                    LeftCoordinate = 0,
+                    TopCoordinate = 0,
+                    WorkAreaHeight = 1040,
+                    WorkAreaWidth = 1920,
+                    MonitorHeight = 1080,
+                    MonitorWidth = 1920,
+                    IsSelected = true,
+                },
+            },
+        };
+
+        [TestInitialize]
+        public void TestInitialize()
+        {
+            EditorParameters editorParameters = new EditorParameters();
+            FancyZonesEditorHelper.Files.ParamsIOHelper.WriteData(editorParameters.Serialize(Parameters));
+
+            CustomLayouts customLayouts = new CustomLayouts();
+            FancyZonesEditorHelper.Files.CustomLayoutsIOHelper.WriteData(customLayouts.Serialize(CustomLayouts));
+
+            LayoutTemplates layoutTemplates = new LayoutTemplates();
+            LayoutTemplates.TemplateLayoutsListWrapper templateLayoutsListWrapper = new LayoutTemplates.TemplateLayoutsListWrapper
+            {
+                LayoutTemplates = new List<LayoutTemplates.TemplateLayoutWrapper>
+                {
+                    new LayoutTemplates.TemplateLayoutWrapper
+                    {
+                        Type = LayoutType.Blank.TypeToString(),
+                    },
+                    new LayoutTemplates.TemplateLayoutWrapper
+                    {
+                        Type = LayoutType.Focus.TypeToString(),
+                        ZoneCount = 10,
+                    },
+                    new LayoutTemplates.TemplateLayoutWrapper
+                    {
+                        Type = LayoutType.Rows.TypeToString(),
+                        ZoneCount = 2,
+                        ShowSpacing = true,
+                        Spacing = 10,
+                        SensitivityRadius = 10,
+                    },
+                    new LayoutTemplates.TemplateLayoutWrapper
+                    {
+                        Type = LayoutType.Columns.TypeToString(),
+                        ZoneCount = 2,
+                        ShowSpacing = true,
+                        Spacing = 20,
+                        SensitivityRadius = 20,
+                    },
+                    new LayoutTemplates.TemplateLayoutWrapper
+                    {
+                        Type = LayoutType.Grid.TypeToString(),
+                        ZoneCount = 4,
+                        ShowSpacing = false,
+                        Spacing = 10,
+                        SensitivityRadius = 30,
+                    },
+                    new LayoutTemplates.TemplateLayoutWrapper
+                    {
+                        Type = LayoutType.PriorityGrid.TypeToString(),
+                        ZoneCount = 3,
+                        ShowSpacing = true,
+                        Spacing = 1,
+                        SensitivityRadius = 40,
+                    },
+                },
+            };
+            FancyZonesEditorHelper.Files.LayoutTemplatesIOHelper.WriteData(layoutTemplates.Serialize(templateLayoutsListWrapper));
+
+            DefaultLayouts defaultLayouts = new DefaultLayouts();
+            FancyZonesEditorHelper.Files.DefaultLayoutsIOHelper.WriteData(defaultLayouts.Serialize(DefaultLayoutsList));
+
+            LayoutHotkeys layoutHotkeys = new LayoutHotkeys();
+            FancyZonesEditorHelper.Files.LayoutHotkeysIOHelper.WriteData(layoutHotkeys.Serialize(Hotkeys));
+
+            AppliedLayouts appliedLayouts = new AppliedLayouts();
+            AppliedLayouts.AppliedLayoutsListWrapper appliedLayoutsWrapper = new AppliedLayouts.AppliedLayoutsListWrapper
+            {
+                AppliedLayouts = new List<AppliedLayouts.AppliedLayoutWrapper> { },
+            };
+            FancyZonesEditorHelper.Files.AppliedLayoutsIOHelper.WriteData(appliedLayouts.Serialize(appliedLayoutsWrapper));
+
+            this.RestartScopeExe();
+            Session.Find<Element>(CustomLayouts.CustomLayouts[0].Name).Click();
+        }
+
+        [TestCleanup]
+        public void TestCleanup()
+        {
+            FancyZonesEditorHelper.Files.Restore();
+        }
+
+        [TestMethod]
+        public void DeleteNotAppliedLayout()
+        {
+            var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
+            Session.Find<Element>(deletedLayout).Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            Session.Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.DeleteLayoutButton)).Click();
+            Session.KeyboardAction(Keys.Tab, Keys.Enter);
+
+            // verify the layout is removed
+            Assert.IsTrue(Session.FindAll<Element>(deletedLayout).Count == 0);
+
+            // check the file
+            var customLayouts = new CustomLayouts();
+            var data = customLayouts.Read(customLayouts.File);
+            Assert.AreEqual(CustomLayouts.CustomLayouts.Count - 1, data.CustomLayouts.Count);
+            Assert.IsFalse(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
+        }
+
+        [TestMethod]
+        public void DeleteAppliedLayout()
+        {
+            var deletedLayout = CustomLayouts.CustomLayouts[0].Name;
+            Session.Find<Element>(deletedLayout).Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            Session.Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.DeleteLayoutButton)).Click();
+            Session.KeyboardAction(Keys.Tab, Keys.Enter);
+
+            // verify the layout is removed
+            Assert.IsTrue(Session.FindAll<Element>(deletedLayout).Count == 0);
+
+            // verify the empty layout is selected
+            Assert.IsTrue(Session.Find<Element>(TestConstants.TemplateLayoutNames[LayoutType.Blank])!.Selected);
+
+            // check the file
+            var customLayouts = new CustomLayouts();
+            var data = customLayouts.Read(customLayouts.File);
+            Assert.AreEqual(CustomLayouts.CustomLayouts.Count - 1, data.CustomLayouts.Count);
+            Assert.IsFalse(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
+
+            var appliedLayouts = new AppliedLayouts();
+            var appliedLayoutsData = appliedLayouts.Read(appliedLayouts.File);
+            Assert.AreEqual(LayoutType.Blank.TypeToString(), appliedLayoutsData.AppliedLayouts.Find(x => x.Device.Monitor == Parameters.Monitors[0].Monitor).AppliedLayout.Type);
+        }
+
+        [TestMethod]
+        public void CancelDeletion()
+        {
+            var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
+            Session.Find<Element>(deletedLayout).Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            Session.Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.DeleteLayoutButton)).Click();
+            Session.KeyboardAction(Keys.Tab, Keys.Tab, Keys.Enter);
+
+            // verify the layout is not removed
+            Assert.IsNotNull(Session.Find<Element>(deletedLayout));
+
+            // check the file
+            var customLayouts = new CustomLayouts();
+            var data = customLayouts.Read(customLayouts.File);
+            Assert.AreEqual(CustomLayouts.CustomLayouts.Count, data.CustomLayouts.Count);
+            Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
+        }
+
+        [TestMethod]
+        public void DeleteFromContextMenu()
+        {
+            var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
+            FancyZonesEditorHelper.ClickContextMenuItem(Session, deletedLayout, FancyZonesEditorHelper.ElementName.Delete);
+            Session.KeyboardAction(Keys.Tab, Keys.Enter);
+
+            // verify the layout is removed
+            Assert.IsTrue(Session.FindAll<Element>(deletedLayout).Count == 0);
+
+            // check the file
+            var customLayouts = new CustomLayouts();
+            var data = customLayouts.Read(customLayouts.File);
+            Assert.AreEqual(CustomLayouts.CustomLayouts.Count - 1, data.CustomLayouts.Count);
+            Assert.IsFalse(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
+        }
+
+        [TestMethod]
+        public void DeleteDefaultLayout()
+        {
+            var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
+            FancyZonesEditorHelper.ClickContextMenuItem(Session, deletedLayout, FancyZonesEditorHelper.ElementName.Delete);
+            Session.KeyboardAction(Keys.Tab, Keys.Enter);
+
+            // verify the default layout is reset to the "default" default
+            Session.Find<Element>(TestConstants.TemplateLayoutNames[LayoutType.PriorityGrid]).Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            Assert.IsNotNull(Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.HorizontalDefaultButtonChecked)));
+            Session.Find<Button>(ElementName.Cancel).Click();
+
+            // check the file
+            var defaultLayouts = new DefaultLayouts();
+            var data = defaultLayouts.Read(defaultLayouts.File);
+            string configuration = MonitorConfigurationType.Horizontal.TypeToString();
+            Assert.AreEqual(LayoutType.PriorityGrid.TypeToString(), data.DefaultLayouts.Find(x => x.MonitorConfiguration == configuration).Layout.Type);
+        }
+
+        [TestMethod]
+        public void DeleteLayoutWithHotkey()
+        {
+            var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
+            FancyZonesEditorHelper.ClickContextMenuItem(Session, deletedLayout, FancyZonesEditorHelper.ElementName.Delete);
+            Session.KeyboardAction(Keys.Tab, Keys.Enter);
+
+            // verify the hotkey is available
+            Session.Find<Element>(CustomLayouts.CustomLayouts[0].Name).Find<Button>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            var hotkeyComboBox = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.HotkeyComboBox));
+            Assert.IsNotNull(hotkeyComboBox);
+            hotkeyComboBox.Click();
+
+            var popup = Session.Find<Element>(PowerToys.UITest.By.ClassName(ClassName.Popup));
+            Assert.IsNotNull(popup);
+            try
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    popup.Find<Element>($"{i}");
+                }
+            }
+            catch
+            {
+                Assert.Fail("Hotkey not found");
+            }
+
+            Session.Find<Button>(ElementName.Cancel).Click();
+
+            // check the file
+            var hotkeys = new LayoutHotkeys();
+            var data = hotkeys.Read(hotkeys.File);
+            Assert.AreEqual(0, data.LayoutHotkeys.Count);
+        }
+    }
+}
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs
index ade84b7750d8..39034ecc6039 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs
@@ -213,14 +213,13 @@ public void TestInitialize()
         public void TestCleanup()
         {
             FancyZonesEditorHelper.Files.Restore();
-            this.TestClean();
         }
 
         [TestMethod]
         public void OpenEditMode()
         {
-            Session.Find<Element>(Layouts.CustomLayouts[0].Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
-            Session.FindByAccessibilityId<Button>(AccessibilityId.EditZonesButton).Click();
+            Session.Find<Element>(Layouts.CustomLayouts[0].Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            Session.Find<Button>(By.AccessibilityId(AccessibilityId.EditZonesButton)).Click();
             Assert.IsNotNull(Session.Find<Element>(ElementName.GridLayoutEditor));
             Session.Find<Button>(ElementName.Cancel).Click();
         }
@@ -238,7 +237,7 @@ public void Canvas_AddZone_Save()
         {
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
             FancyZonesEditorHelper.ClickContextMenuItem(Session, canvas.Name, FancyZonesEditorHelper.ElementName.EditZones);
-            Session.FindByAccessibilityId<Button>(AccessibilityId.NewZoneButton).Click();
+            Session.Find<Button>(By.AccessibilityId(AccessibilityId.NewZoneButton)).Click();
             Session.Find<Button>(ElementName.Save).Click();
 
             // check the file
@@ -254,7 +253,7 @@ public void Canvas_AddZone_Cancel()
         {
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
             FancyZonesEditorHelper.ClickContextMenuItem(Session, canvas.Name, FancyZonesEditorHelper.ElementName.EditZones);
-            Session.FindByAccessibilityId<Button>(AccessibilityId.NewZoneButton).Click();
+            Session.Find<Button>(By.AccessibilityId(AccessibilityId.NewZoneButton)).Click();
             Session.Find<Button>(ElementName.Cancel).Click();
 
             // check the file
@@ -367,7 +366,7 @@ public void Canvas_ResizeZone_Save()
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
             FancyZonesEditorHelper.ClickContextMenuItem(Session, canvas.Name, FancyZonesEditorHelper.ElementName.EditZones);
 
-            FancyZonesEditorHelper.GetZone(Session, zoneNumber, FancyZonesEditorHelper.ClassName.CanvasZone)?.FindByAccessibilityId<Element>(FancyZonesEditorHelper.AccessibilityId.TopRightCorner).Drag(xOffset, yOffset);
+            FancyZonesEditorHelper.GetZone(Session, zoneNumber, FancyZonesEditorHelper.ClassName.CanvasZone)?.Find<Element>(By.AccessibilityId(FancyZonesEditorHelper.AccessibilityId.TopRightCorner)).Drag(xOffset, yOffset);
             Session.Find<Button>(ElementName.Save).Click();
 
             // check the file
@@ -404,7 +403,7 @@ public void Canvas_ResizeZone_Cancel()
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
             FancyZonesEditorHelper.ClickContextMenuItem(Session, canvas.Name, FancyZonesEditorHelper.ElementName.EditZones);
 
-            FancyZonesEditorHelper.GetZone(Session, zoneNumber, FancyZonesEditorHelper.ClassName.CanvasZone)?.FindByAccessibilityId<Element>(FancyZonesEditorHelper.AccessibilityId.TopRightCorner).Drag(xOffset, yOffset);
+            FancyZonesEditorHelper.GetZone(Session, zoneNumber, FancyZonesEditorHelper.ClassName.CanvasZone)?.Find<Element>(By.AccessibilityId(FancyZonesEditorHelper.AccessibilityId.TopRightCorner)).Drag(xOffset, yOffset);
             Session.Find<Button>(ElementName.Cancel).Click();
 
             // check the file
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs
index 90836eb3e1ae..0f5694782d4f 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs
@@ -301,7 +301,6 @@ public void TestInitialize()
         public void TestCleanup()
         {
             FancyZonesEditorHelper.Files.Restore();
-            this.TestClean();
         }
 
         [TestMethod]
@@ -309,9 +308,9 @@ public void Initialize()
         {
             foreach (var layout in CustomLayouts.CustomLayouts)
             {
-                Session.Find<Element>(layout.Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
+                Session.Find<Element>(layout.Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
 
-                var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+                var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
                 Assert.IsNotNull(hotkeyComboBox);
 
                 // verify the selected key
@@ -352,11 +351,11 @@ public void Initialize()
         public void Assign_Save()
         {
             var layout = CustomLayouts.CustomLayouts[4]; // a layout without assigned hotkey
-            Session.Find<Element>(layout.Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
+            Session.Find<Element>(layout.Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
 
             // assign hotkey
             const string key = "3";
-            var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
 
@@ -373,8 +372,8 @@ public void Assign_Save()
             Assert.IsTrue(actualData.LayoutHotkeys.Contains(new LayoutHotkeyWrapper { Key = int.Parse(key, CultureInfo.InvariantCulture), LayoutId = layout.Uuid }));
 
             // verify the availability
-            Session.Find<Element>(CustomLayouts.CustomLayouts[5].Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
-            hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            Session.Find<Element>(CustomLayouts.CustomLayouts[5].Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
 
@@ -395,11 +394,11 @@ public void Assign_Save()
         public void Assign_Cancel()
         {
             var layout = CustomLayouts.CustomLayouts[4]; // a layout without assigned hotkey
-            Session.Find<Element>(layout.Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
+            Session.Find<Element>(layout.Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
 
             // assign a hotkey
             const string key = "3";
-            var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
             var popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -414,8 +413,8 @@ public void Assign_Cancel()
             Assert.AreEqual(Hotkeys.ToString(), actualData.ToString());
 
             // verify the availability
-            Session.Find<Element>(CustomLayouts.CustomLayouts[5].Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
-            hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            Session.Find<Element>(CustomLayouts.CustomLayouts[5].Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
             popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -436,9 +435,9 @@ public void Assign_AllPossibleValues()
             for (int i = 0; i < 10; i++)
             {
                 string layoutName = $"Layout {i}";
-                Session.Find<Element>(layoutName).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
+                Session.Find<Element>(layoutName).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
 
-                var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+                var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
                 Assert.IsNotNull(hotkeyComboBox);
                 hotkeyComboBox.Click();
                 var popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -452,8 +451,8 @@ public void Assign_AllPossibleValues()
             {
                 int layout = 10;
                 string layoutName = $"Layout {layout}";
-                Session.Find<Element>(layoutName).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
-                var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+                Session.Find<Element>(layoutName).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+                var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
                 Assert.IsNotNull(hotkeyComboBox);
                 hotkeyComboBox.Click();
                 var popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -481,11 +480,11 @@ public void Reset_Save()
         {
             var layout = CustomLayouts.CustomLayouts[0]; // a layout with assigned hotkey
             int assignedKey = Hotkeys.LayoutHotkeys.Find(x => x.LayoutId == layout.Uuid).Key;
-            Session.Find<Element>(layout.Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
+            Session.Find<Element>(layout.Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
             const string None = "None";
 
             // reset the hotkey
-            var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
             var popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -500,8 +499,8 @@ public void Reset_Save()
             Assert.IsFalse(actualData.LayoutHotkeys.Contains(new LayoutHotkeyWrapper { Key = assignedKey, LayoutId = layout.Uuid }));
 
             // verify the previously assigned key is available
-            Session.Find<Element>(CustomLayouts.CustomLayouts[6].Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
-            hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            Session.Find<Element>(CustomLayouts.CustomLayouts[6].Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
             popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -521,11 +520,11 @@ public void Reset_Cancel()
         {
             var layout = CustomLayouts.CustomLayouts[0]; // a layout with assigned hotkey
             int assignedKey = Hotkeys.LayoutHotkeys.Find(x => x.LayoutId == layout.Uuid).Key;
-            Session.Find<Element>(layout.Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
+            Session.Find<Element>(layout.Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
             const string None = "None";
 
             // assign hotkey
-            var hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            var hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
             var popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
@@ -540,8 +539,8 @@ public void Reset_Cancel()
             Assert.IsTrue(actualData.LayoutHotkeys.Contains(new LayoutHotkeyWrapper { Key = assignedKey, LayoutId = layout.Uuid }));
 
             // verify the previously assigned key is not available
-            Session.Find<Element>(CustomLayouts.CustomLayouts[6].Name).FindByAccessibilityId<Button>(AccessibilityId.EditLayoutButton).Click();
-            hotkeyComboBox = Session.FindByAccessibilityId<Element>(AccessibilityId.HotkeyComboBox);
+            Session.Find<Element>(CustomLayouts.CustomLayouts[6].Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
+            hotkeyComboBox = Session.Find<Element>(By.AccessibilityId(AccessibilityId.HotkeyComboBox));
             Assert.IsNotNull(hotkeyComboBox);
             hotkeyComboBox.Click();
             popup = Session.Find<Element>(By.ClassName(ClassName.Popup));
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/NewFancyZonesEditorTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/NewFancyZonesEditorTest.cs
index a856f2419a31..a374476e7d13 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/NewFancyZonesEditorTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/NewFancyZonesEditorTest.cs
@@ -40,12 +40,6 @@ public void TestInitialize()
                 this.RestartScopeExe();
             }
 
-            [TestCleanup]
-            public void TestCleanup()
-            {
-                this.TestClean();
-            }
-
             [TestMethod]
             public void FirstLaunch() // verify the session is initialized
             {
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
index 7de2b6d9297e..2ff3df954ae4 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
@@ -171,21 +171,10 @@ public static void ClassCleanup()
             FancyZonesEditorHelper.Files.Restore();
         }
 
-        [TestInitialize]
-        public void TestInitialize()
-        {
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            this.TestClean();
-        }
-
         [TestMethod]
         public void OpenNewLayoutDialog() // verify the new layout dialog is opened
         {
-            Session.FindByAccessibilityId<Button>(AccessibilityId.NewLayoutButton).Click();
+            Session.Find<Button>(By.AccessibilityId(AccessibilityId.NewLayoutButton)).Click();
             Assert.IsNotNull(Session.Find<Element>("Choose layout type")); // check the pane header
         }
 
@@ -193,7 +182,7 @@ public void TestCleanup()
         public void OpenEditLayoutDialog() // verify the edit layout dialog is opened
         {
             Session.Find<Button>(TestConstants.TemplateLayoutNames[LayoutType.Grid]).Click();
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>(FancyZonesEditorHelper.AccessibilityId.DialogTitle)); // check the pane header
+            Assert.IsNotNull(Session.Find<Element>(By.AccessibilityId(FancyZonesEditorHelper.AccessibilityId.DialogTitle))); // check the pane header
             Assert.IsNotNull(Session.Find<Element>($"Edit '{TestConstants.TemplateLayoutNames[LayoutType.Grid]}'")); // verify it's opened for the correct layout
         }
 
@@ -204,7 +193,7 @@ public void OpenEditLayoutDialog_ByContextMenu_TemplateLayout() // verify the ed
             var menu = Session.Find<Element>(By.ClassName(ClassName.ContextMenu));
             menu.Find<Element>(FancyZonesEditorHelper.ElementName.Edit).Click();
 
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>(FancyZonesEditorHelper.AccessibilityId.DialogTitle)); // check the pane header
+            Assert.IsNotNull(Session.Find<Element>(By.AccessibilityId(FancyZonesEditorHelper.AccessibilityId.DialogTitle))); // check the pane header
             Assert.IsNotNull(Session.Find<Element>($"Edit '{TestConstants.TemplateLayoutNames[LayoutType.Grid]}'")); // verify it's opened for the correct layout
         }
 
@@ -216,7 +205,7 @@ public void OpenEditLayoutDialog_ByContextMenu_CustomLayout() // verify the edit
             var menu = Session.Find<Element>(By.ClassName(ClassName.ContextMenu));
             menu.Find<Element>(FancyZonesEditorHelper.ElementName.Edit).Click();
 
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>(FancyZonesEditorHelper.AccessibilityId.DialogTitle)); // check the pane header
+            Assert.IsNotNull(Session.Find<Element>(By.AccessibilityId(FancyZonesEditorHelper.AccessibilityId.DialogTitle))); // check the pane header
             Assert.IsNotNull(Session.Find<Element>($"Edit '{layoutName}'")); // verify it's opened for the correct layout
         }
 
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
index ff2361340b38..9e3ebc8c63bb 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
@@ -194,7 +194,6 @@ public void TesTestInitializetCleanup()
         [TestCleanup]
         public void TestCleanup()
         {
-            this.TestClean();
             FancyZonesEditorHelper.Files.Restore();
         }
 
@@ -206,7 +205,7 @@ public void ZoneNumber_Cancel()
             var expected = layout.ZoneCount;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.TemplateZoneSlider);
+            var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.TemplateZoneSlider));
             Assert.IsNotNull(slider);
             slider.SendKeys(Keys.Left);
 
@@ -231,7 +230,7 @@ public void HighlightDistance_Initialize()
 
                 Session.Find<Button>(name).Click();
 
-                var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.SensitivitySlider);
+                var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SensitivitySlider));
                 Assert.IsNotNull(slider);
                 var expected = Layouts.LayoutTemplates.Find(x => x.Type == type.TypeToString()).SensitivityRadius;
                 Assert.AreEqual($"{expected}", slider.Text);
@@ -248,7 +247,7 @@ public void HighlightDistance_Save()
             var value = layout.SensitivityRadius;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.SensitivitySlider);
+            var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SensitivitySlider));
             Assert.IsNotNull(slider);
             slider.SendKeys(Keys.Right);
 
@@ -272,7 +271,7 @@ public void HighlightDistance_Cancel()
             var expected = layout.SensitivityRadius;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.SensitivitySlider);
+            var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SensitivitySlider));
             Assert.IsNotNull(slider);
             slider.SendKeys(Keys.Right);
             Session.Find<Button>(ElementName.Cancel).Click();
@@ -297,7 +296,7 @@ public void SpaceAroundZones_Initialize()
 
                 Session.Find<Button>(name).Click();
 
-                var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider);
+                var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingSlider));
                 Assert.IsNotNull(slider);
 
                 var spacingEnabled = Layouts.LayoutTemplates.Find(x => x.Type == type.TypeToString()).ShowSpacing;
@@ -318,7 +317,7 @@ public void SpaceAroundZones_Slider_Save()
             var expected = layout.Spacing + 1;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider);
+            var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingSlider));
             Assert.IsNotNull(slider);
             slider.SendKeys(Keys.Right);
             Assert.AreEqual($"{expected}", slider.Text);
@@ -340,7 +339,7 @@ public void SpaceAroundZones_Slider_Cancel()
             var expected = layout.Spacing;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var slider = Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider);
+            var slider = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingSlider));
             Assert.IsNotNull(slider);
             slider.SendKeys(Keys.Right);
             Assert.AreEqual($"{expected + 1}", slider.Text);
@@ -362,11 +361,11 @@ public void SpaceAroundZones_Toggle_Save()
             var expected = !layout.ShowSpacing;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var toggle = Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingToggle);
+            var toggle = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingToggle));
             Assert.IsNotNull(toggle);
             toggle.Click();
             Assert.AreEqual(expected, toggle.Selected);
-            Assert.AreEqual(expected, Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider)?.Enabled);
+            Assert.AreEqual(expected, Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingSlider))?.Enabled);
 
             Session.Find<Button>(ElementName.Save).Click();
 
@@ -385,11 +384,11 @@ public void SpaceAroundZones_Toggle_Cancel()
             var expected = layout.ShowSpacing;
             Session.Find<Button>(TestConstants.TemplateLayoutNames[type]).Click();
 
-            var toggle = Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingToggle);
+            var toggle = Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingToggle));
             Assert.IsNotNull(toggle);
             toggle.Click();
             Assert.AreNotEqual(expected, toggle.Selected);
-            Assert.AreNotEqual(expected, Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider)?.Enabled);
+            Assert.AreNotEqual(expected, Session.Find<Element>(PowerToys.UITest.By.AccessibilityId(AccessibilityId.SpacingSlider))?.Enabled);
 
             Session.Find<Button>(ElementName.Cancel).Click();
 
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs
index 08eae1943f29..39d0175e13bc 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs
@@ -32,12 +32,6 @@ public void TestInitialize()
             FancyZonesEditorHelper.Files.Restore();
         }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            this.TestClean();
-        }
-
         [TestMethod]
         public void EditorParams_VerifySelectedMonitor()
         {
@@ -121,7 +115,7 @@ public void EditorParams_VerifyMonitorScaling()
             this.RestartScopeExe();
 
             var monitor = Session.Find<Element>("Monitor 1");
-            var scaling = monitor.FindByAccessibilityId<Element>("ScalingText");
+            var scaling = monitor.Find<Element>(By.AccessibilityId("ScalingText"));
             Assert.AreEqual("200%", scaling.Text);
         }
 
@@ -157,7 +151,7 @@ public void EditorParams_VerifyMonitorResolution()
             this.RestartScopeExe();
 
             var monitor = Session.Find<Element>("Monitor 1");
-            var resolution = monitor.FindByAccessibilityId<Element>("ResolutionText");
+            var resolution = monitor.Find<Element>(By.AccessibilityId("ResolutionText"));
             Assert.AreEqual("1920 × 1080", resolution.Text);
         }
 
@@ -317,7 +311,7 @@ public void AppliedLayouts_LayoutsApplied()
             Assert.IsTrue(layoutOnMonitor1.Selected);
 
             // check layout on monitor 2
-            Session.FindByAccessibilityId<Element>("Monitors").Find<Element>("Monitor 2").Click();
+            Session.Find<Element>(By.AccessibilityId("Monitors")).Find<Element>("Monitor 2").Click();
             var layoutOnMonitor2 = Session.Find<Element>(customLayoutListWrapper.CustomLayouts[0].Name);
             Assert.IsNotNull(layoutOnMonitor2);
             Assert.IsTrue(layoutOnMonitor2.Selected);
@@ -545,12 +539,12 @@ public void AppliedLayouts_NoLayoutsApplied_TemplateDefaultLayout()
 
             // check the number of zones and spacing
             Session.Find<Button>(TestConstants.TemplateLayoutNames[LayoutType.Grid]).Click();
-            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.ZoneCount, int.Parse(Session.FindByAccessibilityId<Element>(AccessibilityId.TemplateZoneSlider)?.Text!, CultureInfo.InvariantCulture));
-            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.Spacing, int.Parse(Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider)?.Text!, CultureInfo.InvariantCulture));
-            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.ShowSpacing, Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingSlider)?.Enabled);
-            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.ShowSpacing, Session.FindByAccessibilityId<Element>(AccessibilityId.SpacingToggle)?.Selected);
-            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.SensitivityRadius, int.Parse(Session.FindByAccessibilityId<Element>(AccessibilityId.SensitivitySlider)?.Text!, CultureInfo.InvariantCulture));
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>(AccessibilityId.HorizontalDefaultButtonChecked));
+            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.ZoneCount, int.Parse(Session.Find<Element>(By.AccessibilityId(AccessibilityId.TemplateZoneSlider))?.Text!, CultureInfo.InvariantCulture));
+            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.Spacing, int.Parse(Session.Find<Element>(By.AccessibilityId(AccessibilityId.SpacingSlider))?.Text!, CultureInfo.InvariantCulture));
+            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.ShowSpacing, Session.Find<Element>(By.AccessibilityId(AccessibilityId.SpacingSlider))?.Enabled);
+            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.ShowSpacing, Session.Find<Element>(By.AccessibilityId(AccessibilityId.SpacingToggle))?.Selected);
+            Assert.AreEqual(defaultLayoutsListWrapper.DefaultLayouts[0].Layout.SensitivityRadius, int.Parse(Session.Find<Element>(By.AccessibilityId(AccessibilityId.SensitivitySlider))?.Text!, CultureInfo.InvariantCulture));
+            Assert.IsNotNull(Session.Find<Element>(By.AccessibilityId(AccessibilityId.HorizontalDefaultButtonChecked)));
         }
 
         [TestMethod]
@@ -762,7 +756,7 @@ public void FirstLaunch()
 
             // verify editor opens without errors
             this.RestartScopeExe();
-            Assert.IsNotNull(Session.FindByAccessibilityId<Element>(FancyZonesEditorHelper.AccessibilityId.MainWindow));
+            Assert.IsNotNull(Session.Find<Element>(By.AccessibilityId(FancyZonesEditorHelper.AccessibilityId.MainWindow)));
         }
     }
 }