diff --git a/dev/WebView2/InteractionTests/WebView2Tests.cs b/dev/WebView2/InteractionTests/WebView2Tests.cs
index 3a425362f1..6f98836ae6 100644
--- a/dev/WebView2/InteractionTests/WebView2Tests.cs
+++ b/dev/WebView2/InteractionTests/WebView2Tests.cs
@@ -8,6 +8,7 @@
 using Microsoft.Windows.Apps.Test.Automation;
 using Microsoft.Windows.Apps.Test.Foundation;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Microsoft.Windows.Apps.Test.Foundation.Waiters;
 
 #if USING_TAEF
 using WEX.TestExecution;
@@ -23,10 +24,8 @@
 using System.IO;
 using System.Runtime.InteropServices;
 
-using TextBlock = Microsoft.Windows.Apps.Test.Foundation.Controls.TextBlock;
 using Button = Microsoft.Windows.Apps.Test.Foundation.Controls.Button;
 using System.Net.Http;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests
@@ -127,7 +126,7 @@ private static int GetInstalledBrowserVersion()
             int retval = NativeMethods.GetAvailableCoreWebView2BrowserVersionString(string.Empty, out browserVersionPtr);
             if (retval != (int)NativeMethods.HResults.S_OK)
             {
-                Log.Warning("WebView2Tests Init: Error: got hresult {0} retrieving GetAvailableCoreWebView2BrowserVersionString", retval);
+                Log.Warning("WebView2Tests Init: Error: got hresult {0:x8} retrieving GetAvailableCoreWebView2BrowserVersionString", retval);
             }
             else if (browserVersionPtr == IntPtr.Zero)
             {
@@ -328,15 +327,6 @@ private static void CompleteTestAndWaitForResult(string selectedTest)
                 waiter.TryWait();
             }
 
-            for (int i = 0; i <= 2; i++)
-            {
-                if (expectedValue != result.Value)
-                {
-                    Log.Comment($"CompleteTestAndWaitForResult: Expected '{expectedValue}', result was '{result.Value}'. Waiting...");
-                    Thread.Sleep(TimeSpan.FromMilliseconds(500));
-                }
-            }
-
             Verify.AreEqual(expectedValue, result.Value);
         }
 
@@ -376,6 +366,7 @@ private static void WaitForTextBoxValue(Edit textbox, string expectedValue, bool
 
         private static void DoSelectAllByKeyboard()
         {
+            Log.Comment("Do Select All");
             KeyboardHelper.PressDownModifierKey(ModifierKey.Control);
             TextInput.SendText("a");
             KeyboardHelper.ReleaseModifierKey(ModifierKey.Control);
@@ -383,6 +374,7 @@ private static void DoSelectAllByKeyboard()
 
         private static void CopySelected()
         {
+            Log.Comment("Do Copy");
             KeyboardHelper.PressDownModifierKey(ModifierKey.Control);
             TextInput.SendText("c");
             KeyboardHelper.ReleaseModifierKey(ModifierKey.Control);
@@ -390,6 +382,7 @@ private static void CopySelected()
 
         private static void PasteClipboard()
         {
+            Log.Comment("Do Paste");
             KeyboardHelper.PressDownModifierKey(ModifierKey.Control);
             TextInput.SendText("v");
             KeyboardHelper.ReleaseModifierKey(ModifierKey.Control);
@@ -429,51 +422,22 @@ private static void ChooseTest(string testName, bool waitForLoadCompleted = true
         private static void WaitForFocus(string target)
         {
             var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-            TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
-            int numRetries = 0;
-            while (anaheimFocusTextBox.GetText() != target && (numRetries < 20))
-            {
-                // Poll the tooltip. This is a temporary method that will be replaced when task 23527231 is completed making WebMessageReceivedHandler available.
-                InputHelper.MoveMouse(anaheimFocusTextBox, 0, 0);
-                InputHelper.MoveMouse(updateAnaheimFocusTextBlock, 0, 0);
-                numRetries++;
-            }
+            var expectedFocusMessage = "Focus on: " + target;
+            WaitForTextBoxValue(anaheimFocusTextBox, expectedFocusMessage);
+            Log.Comment("Focus is on " + UIObject.Focused);
+            Verify.AreEqual(anaheimFocusTextBox.Value, expectedFocusMessage);
         }
 
-        // Replace calls to WaitForFocusOnSecondWebview with waiters when task 23527231 is completed making WebMessageReceivedHandler available.
-        private static void WaitForFocusOnSecondWebview(string target)
+        // 'target' and 'tabs' should be in accordance with the html page being navigated on.
+        private static void SetWebViewElementFocus(string target, uint tabs)
         {
-            var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-            TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock2");
-            int numRetries = 0;
-            while (anaheimFocusTextBox.GetText() != target && (numRetries < 20))
-            {
-                // Poll the tooltip. This is a temporary method that will be replaced when task 23527231 is completed making WebMessageReceivedHandler available.
-                InputHelper.MoveMouse(anaheimFocusTextBox, 0, 0);
-                InputHelper.MoveMouse(updateAnaheimFocusTextBlock, 0, 0);
-                numRetries++;
-            }
-        }
-
-        // 'focusValue' and 'tabs' should be in accordance with the html page being navigated on.
-        private static void SetWebViewElementFocus(string focusValue, int tabs)
-        {
-            var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-            TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
             Button x1 = new Button(FindElement.ById("TabStopButton1")); // Xaml TabStop 1
-            // TODO_WebView2: Replace waiters when focus logic is implemented by WebMessageReceivedHandler.
-            // Run the 'copy from WebView2' portion of the test on new text.
             x1.SetFocus();
-            // Reset anaheimFocusTextBox
-            InputHelper.MoveMouse(anaheimFocusTextBox, 0, 0);
-            InputHelper.MoveMouse(updateAnaheimFocusTextBlock, 0, 0);
             Wait.ForIdle();
-            Verify.IsTrue(x1.HasKeyboardFocus);
-            for (int tab = 0; tab < tabs; tab++)
-            {
-                KeyboardHelper.PressKey(Key.Tab);
-            }
-            WaitForFocus(focusValue);
+            Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
+
+            KeyboardHelper.PressKey(Key.Tab, ModifierKey.None, tabs);
+            WaitForFocus(target);
         }
 
         [TestMethod]
@@ -491,15 +455,8 @@ public void BasicRenderingTest()
                 ChooseTest("BasicRenderingTest");
                 Wait.ForMilliseconds(100); // rendering a webpage takes some time after navigation completed
 
-                // When we run the rendering test, it will fail because we don't have access to a render target bitmap
-                // or a shared visual from the browser.  So while we invoke the test to get the page set up correctly,
-                // we ignore the result.  We will then check for the appropriate pixel(s) using User32 and GDI32 calls
-                // from the test runner (this executable).  We can't do it in the actual test itself because UWP apps
-                // don't seem to have the capability of creating a modifiable device context.
-                // WaitForResult("BasicRenderingTest");
-
-                Log.Comment("BasicRenderingTest Test App Result ignored due to RTB issues with the test.  Verifying from the test runner.");
-                WebView2Temporary.WebView2RenderingVerifier.VerifyInstances("BasicRenderingTest");
+                // To verify, check for the appropriate pixel(s) using User32 and GDI32 calls here in the test runner.
+                WebView2Temporary.WebView2RenderingVerifier.VerifyInstances("BasicRenderingTest"); 
                 CompleteTestAndWaitForResult("BasicRenderingTest");
             }
         }
@@ -683,11 +640,8 @@ public void NavigationErrorTest()
         // For each of the Focus_* tests: 
         // 1) We Tab/Shift+Tab/Click amongst xaml controls(x1, x2) and web controls(w1, w2). 
         // 2) After each such change:
-        //     a. Validate Edge focus state by hovering over UpdateAnaheimFocusTextBlock, which triggers a tooltip handler 
-        //        in the (Xaml) test app, which tests the color of a rectangle in the webpage that reflects the focused web control(w1, w2, or n/a).
-        //     b. Validate Xaml focus using MITA API's directly. Since WebView2 doesn't have accessibility hooked up yet,
-        //       the FocusAcquiredWaiter will not work correctly with it. Such validation is temporarily commented out 
-        //       with the TODO_WebView2_Accessibility tag in the comments.
+        //     a. Validate Edge focus state by waiting for web message sent when an element gets focus
+        //     b. Validate Xaml focus using MITA APIs directly
         [TestMethod]
         [TestProperty("TestSuite", "A")]
         public void Focus_BasicTabTest()
@@ -702,47 +656,31 @@ public void Focus_BasicTabTest()
             {
                 ChooseTest("Focus_BasicTabTest");
 
-                var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-                TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
-
                 Button x1 = new Button(FindElement.ById("TabStopButton1"));     // Xaml TabStop 1
                 Button x2 = new Button(FindElement.ById("TabStopButton2"));     // Xaml TabStop 2
-                UIObject webviewControl = new UIObject(FindElement.ById("MyWebView2"));
 
                 Log.Comment("Description: x1 -> w1 -> w2 -> x2 ");
                 Log.Comment("Focus on x1");
                 x1.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x1.HasKeyboardFocus);
-
-                //
-                // NOTE: Comments marked with "TODO_WebView2_Accessibility" are validation that should be enabled once accessibility is hooked up.
-                //
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("MyWebView2")))
-
+                Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
 
                 Log.Comment("Tab x1 -> w1");
                 KeyboardHelper.PressKey(Key.Tab);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                // Trigger update of TextBox with Anaheim focus state
                 WaitForFocus("w1");
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
                 Log.Comment("Tab w1 -> w2");
                 KeyboardHelper.PressKey(Key.Tab);
-
                 WaitForFocus("w2");
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
-
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("x2")))=
                 Log.Comment("Tab w2 -> x2");
-                KeyboardHelper.PressKey(Key.Tab);
-                // TODO_WebView2_Accessibility : xamlFocusWaiter.Wait();
-                WaitForFocus("n/a");
-
-                Verify.IsTrue(x2.HasKeyboardFocus);
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton2"))
+                {
+                    KeyboardHelper.PressKey(Key.Tab);
+                    xamlFocusWaiter.Wait();
+                    Log.Comment("Focus is on " + UIObject.Focused);
+                    Verify.IsTrue(x2.HasKeyboardFocus, "TabStopButton2 has keyboard focus");
+                }
 
                 CompleteTestAndWaitForResult("Focus_BasicTabTest");
             }
@@ -763,44 +701,32 @@ public void Focus_ReverseTabTest()
             {
                 ChooseTest("Focus_ReverseTabTest");
 
-                var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-                TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
-
                 Button x1 = new Button(FindElement.ById("TabStopButton1"));     // Xaml TabStop 1
                 Button x2 = new Button(FindElement.ById("TabStopButton2"));     // Xaml TabStop 2
-                UIObject webviewControl = new UIObject(FindElement.ById("MyWebView2"));
 
                 Log.Comment("Description: x2 shift-> w2 shift-> w1 shift-> x1");
                 Log.Comment("Focus on x2");
                 x2.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x2.HasKeyboardFocus);
+                Verify.IsTrue(x2.HasKeyboardFocus, "TabStopButton2 has keyboard focus");
 
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("MyWebView2")))
                 Log.Comment("Shift+Tab x2 -> w2");
                 KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                // Hover over UpdaetAnaheimFocusTextBlock to trigger update of TextBox with Anaheim focus state
-                InputHelper.MoveMouse(anaheimFocusTextBox, 0, 0);
-                InputHelper.MoveMouse(updateAnaheimFocusTextBlock, 0, 0);
                 WaitForFocus("w2");
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
                 Log.Comment("Shift+Tab w2 -> w1");
                 KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-
                 WaitForFocus("w1");
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
 
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("x1")))
                 Log.Comment("Shift+Tab w1 -> x1");
-                KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                WaitForFocus("n/a");
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton1"))
+                {
 
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                    KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
+                    xamlFocusWaiter.Wait();
+                    Log.Comment("Focus is on " + UIObject.Focused);
+                    Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
+                }
 
                 CompleteTestAndWaitForResult("Focus_ReverseTabTest");
             }
@@ -821,59 +747,46 @@ public void Focus_BackAndForthTabTest()
             {
                 ChooseTest("Focus_BackAndForthTabTest");
 
-                var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-                TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
-
                 Button x1 = new Button(FindElement.ById("TabStopButton1"));     // Xaml TabStop 1
-                Button x2 = new Button(FindElement.ById("TabStopButton2"));     // Xaml TabStop 2
-                UIObject webviewControl = new UIObject(FindElement.ById("MyWebView2"));
 
                 Log.Comment("Description: x1 -> w1 shift-> x1 -> w1 -> x1");
                 Log.Comment("Focus on x1");
                 x1.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
 
-                // TODO_WebView2_Accessibility: (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("MyWebView2")))
                 Log.Comment("Tab x1 -> w1");
                 KeyboardHelper.PressKey(Key.Tab);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                // Hover over UpdaetAnaheimFocusTextBlock to trigger update of TextBox with Anaheim focus state
                 WaitForFocus("w1");
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
 
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("x1")))
                 Log.Comment("Shift+Tab w1 -> x1");
-                KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                WaitForFocus("n/a");
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton1"))
+                {
+                    KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
+                    xamlFocusWaiter.Wait();
+                    Log.Comment("Focus is on " + UIObject.Focused);
+                    Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
+                }
 
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("MyWebView2")))
                 Log.Comment("Tab x1 -> w1");
                 KeyboardHelper.PressKey(Key.Tab);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                // Hover over UpdaetAnaheimFocusTextBlock to trigger update of TextBox with Anaheim focus state
                 WaitForFocus("w1");
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
                 Log.Comment("Shift+Tab w1 -> x1");
-                KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-
-                WaitForFocus("n/a");
-
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton1"))
+                {
+                    KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
+                    xamlFocusWaiter.Wait();
+                    Log.Comment("Focus is on " + UIObject.Focused);
+                    Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
+                }
 
                 CompleteTestAndWaitForResult("Focus_BackAndForthTabTest");
             }
         }
 
         // See comment on Focus_BasicTabTest() for details on test mechanism.
-        [TestMethod] 
-        [TestProperty("Ignore", "True")] // Task 32016751: [WebView2] Re-enable Focus_MouseActivateTest and MouseCaptureTest
+        [TestMethod]
         [TestProperty("TestSuite", "A")]
         public void Focus_MouseActivateTest()
         {
@@ -887,20 +800,15 @@ public void Focus_MouseActivateTest()
             {
                 ChooseTest("Focus_MouseActivateTest");
 
-                var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-                TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
-
                 Button x1 = new Button(FindElement.ById("TabStopButton1"));     // Xaml TabStop 1
-                Button x2 = new Button(FindElement.ById("TabStopButton2"));     // Xaml TabStop 2
                 UIObject webviewControl = new UIObject(FindElement.ById("MyWebView2"));
 
                 Log.Comment("Test1: Focus on x1, Click on w1, Shift+Tab w2 -> w1, Click on x2");
                 Log.Comment("Focus on x1");
                 x1.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
 
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("MyWebView2")))
                 Log.Comment("Click on w2");
 
                 Rectangle bounds = webviewControl.BoundingRectangle;
@@ -911,29 +819,22 @@ public void Focus_MouseActivateTest()
                 InputHelper.MoveMouse(webviewControl, -bounds.Width / 2 + w2_offsetX, -bounds.Height / 2 + w2_offsetY);
                 PointerInput.Press(PointerButtons.Primary);
                 PointerInput.Release(PointerButtons.Primary);
-                Wait.ForIdle();
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
 
-                // Hover over UpdaetAnaheimFocusTextBlock to trigger update of TextBox with Anaheim focus state
                 WaitForFocus("w2");
 
                 Log.Comment("Shift+Tab w2 -> w1");
                 KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-
                 WaitForFocus("w1");
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
-
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("x2")))
-
-                Log.Comment("Click on x2");
-                InputHelper.MoveMouse(x2, 10, 10);
-                PointerInput.Press(PointerButtons.Primary);
-                PointerInput.Release(PointerButtons.Primary);
-                Wait.ForIdle();
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                WaitForFocus("n/a");
+                Log.Comment("Click on x1");
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton1"))
+                {
+                    InputHelper.MoveMouse(x1, 10, 10);
+                    PointerInput.Press(PointerButtons.Primary);
+                    PointerInput.Release(PointerButtons.Primary);
+                    xamlFocusWaiter.Wait();
+                    Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
+                }
 
                 CompleteTestAndWaitForResult("Focus_MouseActivateTest");
             }
@@ -970,9 +871,6 @@ public void MultipleWebviews_FocusTest()
             {
                 ChooseTest("MultipleWebviews_FocusTest");
 
-                var anaheimFocusTextBox = new Edit(FindElement.ById("AnaheimFocusTextBox"));
-                TextBlock updateAnaheimFocusTextBlock = FindElement.ByName<TextBlock>("UpdateAnaheimFocusTextBlock");
-
                 Button x1 = new Button(FindElement.ById("TabStopButton1"));     // Xaml TabStop 1
                 Button x2 = new Button(FindElement.ById("TabStopButton2"));     // Xaml TabStop 2
                 UIObject webviewControl = new UIObject(FindElement.ById("MyWebView2"));
@@ -984,38 +882,31 @@ public void MultipleWebviews_FocusTest()
                 Wait.ForIdle();
                 Verify.IsTrue(x1.HasKeyboardFocus);
 
-                //
-                // NOTE: Comments marked with "TODO_WebView2_Accessibility" are validation that should be enabled once accessibility is hooked up.
-                //
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("MyWebView2")))
-                // Expected focused element will have suffix 'B' if it belong to the second webview control (MyWebView2B) otherwise it will have no suffix.
                 Log.Comment("Tab tabstop1 -> MyWebView2");
                 KeyboardHelper.PressKey(Key.Tab);
-                // TODO_WebView2_Accessibility: xamlFocusWaiter.Wait();
-
-                // Hover over UpdaetAnaheimFocusTextBlock to trigger update of TextBox with Anaheim focus state
                 WaitForFocus("w1");
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
-
                 Log.Comment("Tab to move to next element within first webview page");
                 KeyboardHelper.PressKey(Key.Tab);
+
                 Log.Comment("Tab MyWebView2 -> tabstop2");
-                KeyboardHelper.PressKey(Key.Tab);
-                Wait.ForIdle();
-                Verify.IsTrue(x2.HasKeyboardFocus);
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton2"))
+                {
+                    KeyboardHelper.PressKey(Key.Tab);
+                    xamlFocusWaiter.Wait();
+                    Verify.IsTrue(x2.HasKeyboardFocus, "TabStopButton2 has keyboard focus");
+                }
 
-                // TODO_WebView2_Accessibility: Verify.IsTrue(webviewControl.HasKeyboardFocus);
-                // TODO_WebView2_Accessibility: using (var xamlFocusWaiter = new FocusAcquiredWaiter(UICondition.CreateFromId("x2")))
                 Log.Comment("Tab tabstop2 -> MyWebView2B");
                 KeyboardHelper.PressKey(Key.Tab);
-                // TODO_WebView2_Accessibility xamlFocusWaiter.Wait();
+                WaitForFocus("w1B");
 
-                WaitForFocusOnSecondWebview("w1B");
-
-                KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
-                Wait.ForIdle();
-                Verify.IsTrue(x2.HasKeyboardFocus);
+                using (var xamlFocusWaiter = new FocusAcquiredWaiter("TabStopButton2"))
+                {
+                    KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift);
+                    xamlFocusWaiter.Wait();
+                    Verify.IsTrue(x2.HasKeyboardFocus, "TabStopButton2 has keyboard focus");
+                }
 
                 CompleteTestAndWaitForResult("MultipleWebviews_FocusTest");
             }
@@ -1041,8 +932,9 @@ public void MultipleWebviews_BasicRenderingTest()
             }
         }
 
-        //[TestMethod] // TODO: Investigate why LanguageTest is failing on latest WebView2 runtime
-        //[TestProperty("TestSuite", "B")]
+        [TestMethod]
+        [TestProperty("TestSuite", "B")]
+        [TestProperty("Ignore", "True")] // TODO: Investigate why LanguageTest is failing on latest WebView2 runtime
         public void MultipleWebviews_LanguageTest()
         {
             if (!PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone5))
@@ -1077,13 +969,13 @@ public void CopyPasteTest()
 
             using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))
             {
-                var result = new Edit(FindElement.ById("TestResult"));
                 ChooseTest("CopyPasteTest");
 
                 var CopyPasteTextBox1 = new Edit(FindElement.ById("CopyPasteTextBox1"));
                 var CopyPasteTextBox2 = new Edit(FindElement.ById("CopyPasteTextBox2"));
 
                 // Copy text to SimpleInputPage's text box page.
+                Log.Comment("Copy and paste text to SimpleInputPage's text box page...");
                 CopyPasteTextBox1.SetFocus();
                 DoSelectAllByKeyboard();
                 CopySelected();
@@ -1094,6 +986,7 @@ public void CopyPasteTest()
                 using (var clearClipboardWaiter = new ValueChangedEventWaiter(CopyPasteTextBox2, "Clear"))
                 {
                     // "Clear" clipboard by copying text between TextBoxes on Xaml page.
+                    Log.Comment("Clear clipboard by copying text between TextBoxes on Xaml page...");
                     CopyPasteTextBox1.SetValue("Clear");
                     CopyPasteTextBox1.SetFocus();
                     Wait.ForIdle();
@@ -1112,6 +1005,7 @@ public void CopyPasteTest()
                 SetWebViewElementFocus("w2", 2);
                 using (var pasteTestWaiter = new ValueChangedEventWaiter(CopyPasteTextBox2, "PasteTest"))
                 {
+                    Log.Comment("Selecting html content from step 1 and copying out of webview for verification...");
                     DoSelectAllByKeyboard();
                     CopySelected();
                     CopyPasteTextBox2.SetFocus();
@@ -1124,6 +1018,7 @@ public void CopyPasteTest()
                 SetWebViewElementFocus("w2", 2);
                 using (var copyTestWaiter = new ValueChangedEventWaiter(CopyPasteTextBox1, "CopyTest"))
                 {
+                    Log.Comment("Inject new text into html textbox and copy out to verify copy from webview...");
                     TextInput.SendText("CopyTest");
                     DoSelectAllByKeyboard();
                     CopySelected();
@@ -1155,10 +1050,9 @@ public void BasicKeyboardTest()
                 // Result should be "Hello 123 World" via:
                 // Write Hello Wor after navigating to textbox in webview.
                 Button x1 = new Button(FindElement.ById("TabStopButton1")); // Xaml TabStop 1
-                Log.Comment("Set focus on x1 and verify it has keyboard focus...");
                 x1.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
 
                 Log.Comment("Tab to w1...");
                 KeyboardHelper.PressKey(Key.Tab);
@@ -1189,13 +1083,9 @@ public void BasicKeyboardTest()
                 TextInput.SendText("m");
 
                 // Copy out to PasteBox1 for verification.
-                Log.Comment("Select All by keyboard...");
                 DoSelectAllByKeyboard();
-                Log.Comment("Copy selected...");
                 CopySelected();
-                Log.Comment("Move focus to CopyPasteTextBox2...");
                 CopyPasteTextBox2.SetFocus();
-                Log.Comment("Paste clipboard...");
                 PasteClipboard();
 
                 string expectedText = "Hello 123 Worm";
@@ -1220,17 +1110,17 @@ public void WebMessageReceivedTest()
 
             using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))
             {
-                var result = new Edit(FindElement.ById("TestResult"));
-                Button x1 = new Button(FindElement.ById("TabStopButton1")); // Xaml TabStop 1
                 ChooseTest("WebMessageReceivedTest");
 
                 // Tab to button
+                Button x1 = new Button(FindElement.ById("TabStopButton1")); // Xaml TabStop 1
                 x1.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
                 KeyboardHelper.PressKey(Key.Tab);
                 KeyboardHelper.PressKey(Key.Tab);
                 WaitForFocus("b1");
+
                 // Trigger WebMessage from button press.
                 KeyboardHelper.PressKey(Key.Enter);
 
@@ -1251,25 +1141,22 @@ public void MouseCaptureTest()
 
             using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))
             {
-                var webview = FindElement.ById("MyWebView2");
-                Verify.IsNotNull(webview, "Webview control not found");
-                var result = new Edit(FindElement.ById("TestResult"));
-                Button x1 = new Button(FindElement.ById("TabStopButton1")); // Xaml TabStop 1
                 ChooseTest("MouseCaptureTest");
 
                 var CopyPasteTextBox2 = new Edit(FindElement.ById("CopyPasteTextBox2"));
-                UIObject webviewControl = new UIObject(FindElement.ById("MyWebView2"));
-                Rectangle bounds = webviewControl.BoundingRectangle;
+                Rectangle bounds = FindElement.ById("MyWebView2").BoundingRectangle;
                 // Offsets map pointer to the start of the textbox
                 const int w2_offsetX = 30;
                 const int w2_offsetY = 60;
 
                 // Inject text into text box.
+                Button x1 = new Button(FindElement.ById("TabStopButton1")); // Xaml TabStop 1
                 x1.SetFocus();
                 Wait.ForIdle();
-                Verify.IsTrue(x1.HasKeyboardFocus);
+                Verify.IsTrue(x1.HasKeyboardFocus, "TabStopButton1 has keyboard focus");
                 KeyboardHelper.PressKey(Key.Tab);
                 WaitForFocus("w1");
+
                 TextInput.SendText("MouseCaptureResult");
 
                 // Select text with mouse left-click, drag to outside of wv2, then release
@@ -1403,8 +1290,9 @@ public void GoBackAndForwardTest()
             }
         }
 
-        // [TestMethod] // TODO: Investigate why this test is not completing on 19H1
+        [TestMethod]
         [TestProperty("TestSuite", "B")]
+        [TestProperty("Ignore", "True")] // TODO: Investigate why this test is not completing on 19H1
         public void NavigationStartingTest()
         {
             if (!PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone5))
@@ -1420,6 +1308,17 @@ public void NavigationStartingTest()
             }
         }
 
+        [TestMethod]
+        [TestProperty("TestSuite", "B")]
+        public void NavigationStartingInvalidTest()
+        {
+            using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))
+            {
+                ChooseTest("NavigationStartingInvalidTest");
+                CompleteTestAndWaitForResult("NavigationStartingInvalidTest");
+            }
+        }
+
         [TestMethod]
         [TestProperty("TestSuite", "B")]
         public void ResizeTest()
@@ -1966,7 +1865,6 @@ public void WindowlessPopupTest()
 
                 // Navigates popup to a page
                 CompleteTestAndWaitForResult("WindowlessPopupTest");
-                Wait.ForIdle();
 
                 // Click button in webview to verify interaction works
                 var webview = FindElement.ById("popWebView2");
@@ -2113,7 +2011,7 @@ public void CloseThenDPIChangeTest()
             }
         }
 
-        //[TestMethod] // Test fails because .NET UWP doesn't support Object -> VARIANT marshalling.
+        [TestMethod] // Test fails because .NET UWP doesn't support Object -> VARIANT marshalling.
         [TestProperty("TestSuite", "D")]
         [TestProperty("Ignore", "True")] // 32510465
         public void AddHostObjectToScriptTest()
@@ -2179,6 +2077,78 @@ public void NonAsciiUriTest()
             }
         }
 
+        [TestMethod]
+        [TestProperty("TestSuite", "D")]
+        public void OffTreeWebViewInputTest()
+        {
+            using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))
+            {
+                // Remove the existing webview that was already added to the xaml tree
+                ChooseTest("OffTreeWebViewInputTest", false /* waitForLoadCompleted */);
+
+                // Create a new webview, and call EnsureCoreWebView2Async() on it without adding it to the tree.
+                // Then, add it to the tree so we can see it, and navigate
+                CompleteTestAndWaitForResult("OffTreeWebViewInputTest");
+                WaitForLoadCompleted();
+
+                // Clear the cache so we can find the new webview
+                ElementCache.Clear();
+                var webview = FindElement.ById("MyWebView2");
+
+                // Click in the webview, to ensure we can interact with it, and its HWNDs are parented correctly
+                Rectangle bounds = webview.BoundingRectangle;
+                Log.Comment("Bounds = X:{0}, Y:{1}, Width:{2}, Height:{3}", bounds.X, bounds.Y, bounds.Width, bounds.Height);
+                // TODO_WebView2Input - Task 30555367 - Stack Overflow in WebView2 pointer tests when (MUXC) test infra calls WV2.GetClickablePoint()
+                //                      Workaround to avoid any calls to WebView2.GetClickablePoint
+                /*
+                var point = webview.GetClickablePoint();
+                Log.Comment("ClickablePoint = X:{0}, Y:{1}", point.X, point.Y);
+                // Move mouse to top left coordinate (location of web button) relative from the center of webview
+                InputHelper.MoveMouse(webview,
+                    -bounds.Width/2 + 20, -bounds.Height/2 + 20);
+                */
+                var point = new Point(bounds.X + 20, bounds.Y + 20);
+                Log.Comment("Move mouse to ({0}, {1})", bounds.X + 20, bounds.Y + 20);
+                PointerInput.Move(point);
+
+                PointerInput.Press(PointerButtons.Primary);
+                PointerInput.Release(PointerButtons.Primary);
+                Wait.ForIdle();
+
+                WaitForWebMessageResult("OffTreeWebViewInputTest");
+            }
+        }
+        
+        [TestMethod]
+        [TestProperty("TestSuite", "D")]
+        [TestProperty("Ignore", "True")] // Passes locally, test can be run manually
+        public void HtmlDropdownTest()
+        {
+            using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToBasicWebView2" }))
+            {
+                ChooseTest("HtmlDropdownTest");
+
+                // Click on the select (dropdown) element, which covers the center of the WebView2
+                var webview = FindElement.ById("MyWebView2");
+                Rectangle bounds = webview.BoundingRectangle;
+                var point = new Point(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+                Log.Comment("Move mouse to ({0}, {1})", point.X, point.Y);
+                PointerInput.Move(point);
+                PointerInput.Press(PointerButtons.Primary);
+                PointerInput.Release(PointerButtons.Primary);
+
+                var newPoint = new Point(point.X, point.Y + 110);
+                Log.Comment("Move mouse to another dropdown option");
+                PointerInput.Move(newPoint);
+                Log.Comment("Click other option");
+                PointerInput.Press(PointerButtons.Primary);
+                PointerInput.Release(PointerButtons.Primary);
+
+                // On app side, ensure the right option was selected
+                CompleteTestAndWaitForResult("HtmlDropdownTest");
+            }
+        }
+
         private static void BeginSubTest(string testName, string testDescription)
         {
             Log.Comment(Environment.NewLine + testName + ": " + testDescription);
@@ -2261,7 +2231,6 @@ public void BasicCoreObjectCreationAndDestructionTest()
             using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToCoreObjectsWebView2" }))
             {
                 ChooseTest("BasicCoreObjectCreationAndDestructionTest", false /* waitForLoadCompleted */);
-                Wait.ForIdle();
 
                 Button resetCounts_Button = new Button(FindElement.ById("ResetCounts_Button"));
                 resetCounts_Button.Invoke();
@@ -2668,7 +2637,6 @@ public void ConcurrentCreationRequestsTest()
             using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToCoreObjectsWebView2" }))
             {
                 ChooseTest("ConcurrentCreationRequestsTest", false /* waitForLoadCompleted */);
-                Wait.ForIdle();
 
                 var coreWebView2InitializedCount = new Edit(FindElement.ById("CoreWebView2InitializedCount"));
                 var ensureCoreWebView2CompletionCount = new Edit(FindElement.ById("EnsureCoreWebView2CompletionCount")); 
@@ -2826,7 +2794,6 @@ public void EdgeProcessFailedTest()
             using (var setup = new WebView2TestSetupHelper(new[] { "WebView2 Tests", "navigateToCoreObjectsWebView2" }))
             {
                 ChooseTest("EdgeProcessFailedTest", false /* waitForLoadCompleted */);
-                Wait.ForIdle();
 
                 var coreWebView2InitializedCount = new Edit(FindElement.ById("CoreWebView2InitializedCount"));
                 var ensureCoreWebView2CompletionCount = new Edit(FindElement.ById("EnsureCoreWebView2CompletionCount")); 
@@ -2988,7 +2955,7 @@ public static void VerifyInstances(string testName)
 
         static void CheckWindowPixel(IntPtr targetHwnd, string testName)
         {
-            Log.Comment("Checking hwnd 0x{0:x6} for rendering.");
+            Log.Comment("Checking hwnd 0x{0:x6} for rendering.", targetHwnd);
 
             var targetRect = new NativeMethods.RECT();
             _ = NativeMethods.GetWindowRect(targetHwnd, ref targetRect);
diff --git a/dev/WebView2/TestUI/WebView2BasicPage.xaml b/dev/WebView2/TestUI/WebView2BasicPage.xaml
index f84c72f3ae..fe01d5005d 100644
--- a/dev/WebView2/TestUI/WebView2BasicPage.xaml
+++ b/dev/WebView2/TestUI/WebView2BasicPage.xaml
@@ -43,6 +43,7 @@
                             <ComboBoxItem AutomationProperties.Name="Focus_ReverseTabTest">Focus_ReverseTabTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="GoBackAndForwardTest">GoBackAndForwardTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="HostNameToFolderMappingTest">HostNameToFolderMappingTest</ComboBoxItem>
+                            <ComboBoxItem AutomationProperties.Name="HtmlDropdownTest">HtmlDropdownTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="MouseCaptureTest">MouseCaptureTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="MouseLeftClickTest">MouseLeftClickTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="MouseMiddleClickTest">MouseMiddleClickTest</ComboBoxItem>
@@ -58,8 +59,10 @@
                             <ComboBoxItem AutomationProperties.Name="NavigateToStringTest">NavigateToStringTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="NavigateToVideoTest">NavigateToVideoTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="NavigationErrorTest">NavigationErrorTest</ComboBoxItem>
+                            <ComboBoxItem AutomationProperties.Name="NavigationStartingInvalidTest">NavigationStartingInvalidTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="NavigationStartingTest">NavigationStartingTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="NonAsciiUriTest">NonAsciiUriTest</ComboBoxItem>
+                            <ComboBoxItem AutomationProperties.Name="OffTreeWebViewInputTest">OffTreeWebViewInputTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="ParentVisibilityHiddenTest">ParentVisibilityHiddenTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="ParentVisibilityTurnedOnTest">ParentVisibilityTurnedOnTest</ComboBoxItem>
                             <ComboBoxItem AutomationProperties.Name="PointerReleaseWithoutPressTest">PointerReleaseWithoutPressTest</ComboBoxItem>
@@ -143,25 +146,11 @@
                         <TextBlock Text="Document Title:" FontWeight="Bold" Margin="0,0,5,0" VerticalAlignment="Center"/>
                         <Button x:Name="GetDocumentTitleButton" Content="Get" AutomationProperties.AutomationId="GetDocumentTitleButton" Margin="1,0,1,0" contract7Present:CornerRadius="25" Click="OnGetDocumentTitleButtonClicked"/>
                         <TextBlock x:Name="DocumentTitleTextBlock" AutomationProperties.AutomationId="DocumentTitleTextBlock" Width="1200" IsTextSelectionEnabled="True"/>
-                    </StackPanel>                    
-
-
+                    </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
                         <TextBlock Text="Focus: " FontWeight="Bold" Margin="0,0,5,0" VerticalAlignment="Center"/>
                         <StackPanel Orientation="Horizontal" Margin="0,0,15,0">
-                            <TextBlock x:Name="UpdateAnaheimFocusTextBlock" AutomationProperties.Name="UpdateAnaheimFocusTextBlock" contract7Present:HorizontalTextAlignment="Center" Margin="0,0,5,0">
-                        <Run Text="Web "/><LineBreak/><Run Text="(Hover)" />
-                        <ToolTipService.ToolTip>
-                            <ToolTip x:Name="UpdatingAnaheimFocusToolTip" Content="Updating Anaheim Focus..." Opened="UpdatingAnaheimFocusToolTipOpened"/>
-                        </ToolTipService.ToolTip>
-                            </TextBlock>
-                            <TextBlock x:Name="UpdateAnaheimFocusTextBlock2" AutomationProperties.Name="UpdateAnaheimFocusTextBlock2" contract7Present:HorizontalTextAlignment="Center" Margin="0,0,5,0">
-                        <Run Text="Web2 "/><LineBreak/><Run Text="(Hover)" />
-                        <ToolTipService.ToolTip>
-                            <ToolTip x:Name="UpdatingAnaheimFocusToolTip2" Content="Updating Anaheim Focus..." Opened="UpdatingAnaheimFocusToolTipOpenedMultipleWebview"/>
-                        </ToolTipService.ToolTip>
-                            </TextBlock>
-                            <TextBox x:Name="AnaheimFocusTextBox" AutomationProperties.AutomationId="AnaheimFocusTextBox" Width="80" TextAlignment="Left"/>
+                            <TextBox x:Name="AnaheimFocusTextBox" AutomationProperties.AutomationId="AnaheimFocusTextBox" Width="120" TextAlignment="Left"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Margin="0,0,15,0">
                             <TextBlock Text="Xaml Focus:" Margin="0,0,5,0" VerticalAlignment="Center"/>
@@ -187,8 +176,10 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical">
                             <TextBlock Text="RTB:" FontWeight="Bold" FontSize="11" Margin="0,2,0,2"/>
-                            <Border Width="400" Height="320" BorderBrush="Blue" x:Name="RTBBorder" AutomationProperties.AutomationId="RTBBorder" BorderThickness="1" HorizontalAlignment="Left" Visibility="Visible">
-                                <Image x:Name="ShowRtb1" AutomationProperties.AutomationId="ShowRtb1" Stretch="None" HorizontalAlignment="Left"/>
+                            <Border Width="400" Height="320" BorderBrush="Blue" BorderThickness="1" HorizontalAlignment="Left" Visibility="Visible">
+                                <ScrollViewer x:Name="focusScrollViewer" VerticalScrollBarVisibility="Visible">
+                                    <TextBlock x:Name="focusLog" ></TextBlock>
+                                </ScrollViewer>
                             </Border>
                         </StackPanel>
                     </StackPanel>
diff --git a/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs b/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs
index 93c255e70d..472772b557 100644
--- a/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs
+++ b/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs
@@ -2,27 +2,24 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Windows.UI;
+using Windows.UI.Text;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
-using Windows.UI.Xaml.Automation;
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Globalization;
 using Windows.System;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Text;
 
 #if !BUILD_WINDOWS
 using Popup = Windows.UI.Xaml.Controls.Primitives.Popup;
@@ -167,6 +164,7 @@ enum TestList
             SourceBindingTest,
             GoBackAndForwardTest,
             NavigationStartingTest,
+            NavigationStartingInvalidTest,
             ResizeTest,
             BasicTapTouchTest,
             BasicFlingTouchTest,
@@ -197,6 +195,8 @@ enum TestList
             AddHostObjectToScriptTest,
             UserAgentTest,
             NonAsciiUriTest,
+            OffTreeWebViewInputTest,
+            HtmlDropdownTest,
         };
 
         // Map of TestList entry to its webpage (index in TestPageNames[])
@@ -227,6 +227,7 @@ enum TestList
             { TestList.SourceBindingTest, 5 },
             { TestList.GoBackAndForwardTest, 0 },
             { TestList.NavigationStartingTest, 0 },
+            { TestList.NavigationStartingInvalidTest, 4 },
             { TestList.ResizeTest, 0 },
             { TestList.BasicTapTouchTest, 2 },
             { TestList.BasicFlingTouchTest, 2 },
@@ -257,6 +258,8 @@ enum TestList
             { TestList.AddHostObjectToScriptTest, 0 },
             { TestList.UserAgentTest, 0 },
             { TestList.NonAsciiUriTest, 7 },
+            { TestList.OffTreeWebViewInputTest, 1 },
+            { TestList.HtmlDropdownTest, 5 },
         };
 
         readonly string[] TestPageNames =
@@ -294,12 +297,22 @@ public WebView2BasicPage()
                 Content = "[x1] TabStop1"
             };
             AutomationProperties.SetName(tabStop1, "TabStopButton1");
+            tabStop1.GotFocus += (sender, args) =>
+            {
+                focusLog.Text += "Focus on: [x1]" + "\n";
+                focusScrollViewer.ChangeView(null, focusScrollViewer.ScrollableHeight, null);
+            };
             var tabStop2 = new Button()
             {
                 Name = "TabStopButton2",
                 Content = "[x2] TabStop2"
             };
             AutomationProperties.SetName(tabStop2, "TabStopButton2");
+            tabStop2.GotFocus += (sender, args) =>
+            {
+                focusLog.Text += "Focus on: [x2]" + "\n";
+                focusScrollViewer.ChangeView(null, focusScrollViewer.ScrollableHeight, null);
+            };
 
             AddWebViewControl("MyWebView2");
             // adding tabstop buttons x1 and x2 before and after default webview and its title, respectively
@@ -505,6 +518,7 @@ public void ClearStatus()
             _helpers.ClearStatus();
             var messageReceivedBox = FindName("MessageReceived") as CheckBox;
             messageReceivedBox.IsChecked = false;
+            AnaheimFocusTextBox.Text = string.Empty;
         }
 
         private void TestNameComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -670,39 +684,25 @@ private void TestNameComboBox_SelectionChanged(object sender, SelectionChangedEv
                         string fileLocation = WebView2Common.GetTestPageUri("SimplePageWithNonÅscií.html").ToString();
                         string query = "?query=";
                         box.Text = fileLocation + query;
+
                         WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[test]]);
                     }
                     break;
+                case TestList.OffTreeWebViewInputTest:
+                    {
+                        // Remove existing webview
+                        RemoveWebViewEventHandlers(MyWebView2);
+                        Border parentBorder = MyWebView2.Parent as Border;
+                        parentBorder.Child = null;
+                        parentBorder.BorderBrush = new SolidColorBrush(Colors.Pink);
+                    }
+                    break;
                 default:
                     WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[test]]);
                     break;
             }
         }
 
-        // Update Xaml app's status of focused Anaheim element
-        async public void UpdatingAnaheimFocusToolTipOpened(object sender, RoutedEventArgs args)
-        {
-            var MyWebView2 = FindName("MyWebView2") as WebView2;
-            string result = await MyWebView2.ExecuteScriptAsync("getFocus();");
-            char[] trimChar = { '\"' };
-            AnaheimFocusTextBox.Text = result.Trim(trimChar);
-        }
-
-        // Tooltip helper function for the second webview's tooltip.
-        async public void UpdatingAnaheimFocusToolTipOpenedMultipleWebview(object sender, RoutedEventArgs args)
-        {
-            // If this is run from multiple webview test expecting focus on the second webview control
-            // then set MyWebView2 to MyWebView2B.
-            if (FindName("MyWebView2B") != null)
-            {
-                var MyWebView2 = FindName("MyWebView2B") as WebView2;
-                string result = await MyWebView2.ExecuteScriptAsync("getFocus();");
-                char[] trimChar = { '\"' };
-                AnaheimFocusTextBox.Text = result.Trim(trimChar); // We should be fine checking the same textbox
-            }
-        }
-
-
         private void OnNavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
         {
             // Be careful if changing this message. The "NavigationStarting" string is expected
@@ -765,13 +765,24 @@ private void OnWebMessageReceived(WebView2 sender, CoreWebView2WebMessageReceive
             var toggleSwitch = FindName(sender.Name + "Toggle") as ToggleSwitch;
             if (AreEqualIgnoringSpace(args.Source, sender.Source.ToString()) && toggleSwitch.IsOn)
             {
-                Status1.Text = webMessageAsJson = args.WebMessageAsJson;
                 try
                 {
-                    Status2.Text = webMessageAsString = args.TryGetWebMessageAsString();
+                    webMessageAsString = args.TryGetWebMessageAsString();
+                    if (IsFocusMessage(webMessageAsString))
+                    {
+                        AnaheimFocusTextBox.Text = webMessageAsString;
+                        focusLog.Text += webMessageAsString + "\n";
+                        focusScrollViewer.ChangeView(null, focusScrollViewer.ScrollableHeight, null);
+                    }
+                    else
+                    {
+                        Status1.Text = webMessageAsJson = args.WebMessageAsJson;
+                        Status2.Text = webMessageAsString;
+                    }
                 }
                 catch
                 {
+                    Status1.Text = webMessageAsJson = args.WebMessageAsJson;
                     Status2.Text = "Invalid string (try args.WebMessageAsJson instead)";
                 }
             }
@@ -780,6 +791,12 @@ private void OnWebMessageReceived(WebView2 sender, CoreWebView2WebMessageReceive
             {
                 VerifyWebMessageBasedTest(webMessageAsString, webMessageAsJson);
             }
+
+        }
+
+        private static bool IsFocusMessage(string webMessageAsString)
+        {
+            return webMessageAsString.StartsWith("Focus on:") || webMessageAsString.StartsWith("Blur on:");
         }
 
         private void OnCoreProcessFailed(WebView2 sender, CoreWebView2ProcessFailedEventArgs args)
@@ -831,7 +848,7 @@ void AddWebViewControl(string webviewName)
             stackPanelText.Children.Add(textBlock);
             stackPanelText.Children.Add(toggleSwitch);
 
-            var webView2 = new WebView2() 
+            var webView2 = new WebView2()
             {
                 Name = webviewName,
                 Margin = new Thickness(8, 8, 8, 8)
@@ -843,7 +860,8 @@ void AddWebViewControl(string webviewName)
                 Width = 670,
                 Height = 370,
                 BorderBrush = new SolidColorBrush(Colors.Blue),
-                BorderThickness = new Thickness(1)
+                BorderThickness = new Thickness(1),
+                Name = webviewName + "Border"
             };
             border.Child = webView2;
 
@@ -945,34 +963,6 @@ void HandleWebError(CoreWebView2NavigationCompletedEventArgs args)
             Status2.Text = errorStatus.ToString("G");
         }
 
-        static Color GetPixelAtPoint(Point p, RenderTargetBitmap rtb, byte[] pixelArray)
-        {
-            // BGRA8 format has Blue, Green, Red and Alpha bits together in this order
-            Color pixelColor = new Color();
-            int x = (int)(p.X);
-            int y = (int)(p.Y);
-            int pointPosition = 4 * (rtb.PixelWidth * y + x);
-            pixelColor.B = pixelArray[pointPosition];
-            pixelColor.G = pixelArray[pointPosition + 1];
-            pixelColor.R = pixelArray[pointPosition + 2];
-            pixelColor.A = pixelArray[pointPosition + 3];
-
-            return pixelColor;
-        }
-
-        async Task<Color> SamplePointColors(Image showRtb, int x = 100, int y = 100)
-        {
-            var MyWebView2 = FindName("MyWebView2") as WebView2;
-            Point p1 = new Point(x, y);
-
-            RenderTargetBitmap rtb = new RenderTargetBitmap();
-            await rtb.RenderAsync(MyWebView2);
-            showRtb.Source = rtb;
-            var pixelBuffer = await rtb.GetPixelsAsync();
-            byte[] pixelArray = pixelBuffer.ToArray();       // In BGRA8 format
-            return GetPixelAtPoint(p1, rtb, pixelArray);
-        }
-
         // Some tests receive multiple messages from WebMessageReceived, but we only care about the last one
         bool IsTransientWebMessage(string webMessageAsString)
         {
@@ -985,7 +975,7 @@ bool IsTransientWebMessage(string webMessageAsString)
             // Tests may receive a resize message when the webview is initially displayed on screen
             bool isInitialWindowVisible = webMessageAsString.StartsWith("Visibility state is now") && !IsVisiblityTest(selectedTest);
 
-            return isTapWhenWaitingForSomethingElse || isInitialResize || isInitialWindowVisible;
+            return isTapWhenWaitingForSomethingElse || isInitialResize || isInitialWindowVisible || IsFocusMessage(webMessageAsString);
         }
 
         private static bool IsTransientTapTest(TestList selectedTest)
@@ -1125,6 +1115,10 @@ public void VerifyWebMessageBasedTest(string stringResult, string jsonResult)
                         expectedStringResult = "Example property from host object";
                         break;
 
+                    case TestList.OffTreeWebViewInputTest:
+                        expectedStringResult = "Left mouse button clicked.";
+                        break;
+
                     default:
                         {
                             logger.LogError("Unexpected test type in VerifyWebMessageBasedTest(), got message: " + stringResult);
@@ -1172,14 +1166,6 @@ async public void CompleteCurrentTest(object sender, RoutedEventArgs args)
 
                 switch (selectedTest)
                 {
-                    case TestList.BasicRenderingTest:
-                        {
-                            // BasicRenderingTest not working via RTB due to HWND-based rendering workaround. 
-                            // It is validated in TestRunner side via GDI.
-                            // Color expectedColor = Color.FromArgb(0xFF, 0xFF, 0x80, 0x00); // orange
-                            // await VerifySingleColorTest(selectedTest, expectedColor, logger);
-                        }
-                        break;
 
                     case TestList.NavigationErrorTest:
                         {
@@ -1275,11 +1261,11 @@ async public void CompleteCurrentTest(object sender, RoutedEventArgs args)
                     case TestList.ReloadTest:
                         {
                             Uri prevUri = MyWebView2.Source;
-                            await MyWebView2.ExecuteScriptAsync("document.getElementById(\"textInput1\").value='injectedText';");
+                            await MyWebView2.ExecuteScriptAsync("document.getElementById(\"w1\").value='injectedText';");
                             var task = MyWebView2.GetNavigationCompletedTask();
                             MyWebView2.Reload();
                             await task;
-                            string finalTextContent = await MyWebView2.ExecuteScriptAsync("document.getElementById(\"textInput1\").value;");
+                            string finalTextContent = await MyWebView2.ExecuteScriptAsync("document.getElementById(\"w1\").value;");
                             logger.Verify((finalTextContent == "\"\""),
                                           string.Format("Test {0}: TextBox value was not cleared (\"\"), value: {1}",
                                                         selectedTest.ToString(), finalTextContent));
@@ -1388,45 +1374,43 @@ async public void CompleteCurrentTest(object sender, RoutedEventArgs args)
 
                     case TestList.NavigationStartingTest:
                         {
-
-                            // Part 1: [SimplePage.html] calls  navigateToTextPage() -> Navigates to [SimplePageWithText.html].
+                            // Part 1: [SimplePage.html] calls navigateToTextPage() -> Navigates to [SimplePageWithText.html].
                             //         Ensure we get expected NavigationStarting event/args.
-                            //         Scope startTask to make sure we unsubscribe from NavigationStarting before starting Part 2.
-                            {
-                                var startTask = MyWebView2.GetNavigationStartingTask();
-                                _ = MyWebView2.ExecuteScriptAsync("navigateToTextPage();");
-                                await startTask;
-                                string startingStatus = Status1.Text;
-                                string expectedStatus = "MyWebView2 navigation starting...";
-                                logger.Verify((startingStatus == expectedStatus),
-                                              string.Format("Test {0}: Failed, Expected navigation status: {1} did not match actual navigation status: {2}",
-                                                            selectedTest, expectedStatus, startingStatus));
-                                string navigationStartingUri = Status3.Text;
-                                string expectedUri = WebView2Common.GetTestPageUri("SimplePageWithText.html").ToString();
-                                logger.Verify(AreEqualIgnoringSpace(navigationStartingUri, expectedUri),
-                                              string.Format("Test {0}: Failed, Expected NavigationStarting Uri {1} did not match actual NavigationStarting Uri {2}",
-                                                            selectedTest, expectedUri, navigationStartingUri));
-                                logger.Verify(_isUserInitiated,
-                                              string.Format("Test {0}: Failed, NavigationStartingArgs.IsUserInitiated value: {1}, did not match expected value: true",
-                                                            selectedTest, _isUserInitiated.ToString()));
-                                logger.Verify(!_isRedirected,
-                                              string.Format("Test {0}: Failed, NavigationStartingArgs.IsRedirected value: {1}, did not match expected value: false",
-                                                            selectedTest, _isRedirected.ToString()));
-                            }
-
-                            // Part 2: [SimplePageWithText.html] navigates to http://www.blockedbynavigationstarting.invalid. -> navigation  cancelled via OnNavigationStarting.
-                            //         Ensure we are still on [SimplePageWithText.html] at end.
-                            {
-                                var startTask2 = MyWebView2.GetNavigationStartingTask();
-                                _ = MyWebView2.ExecuteScriptAsync("navigateToInvalidPage();");
-                                await startTask2;
-
-                                string navigationStartingUri = Status3.Text;
-                                string expectedUri = WebView2Common.GetTestPageUri("SimplePageWithText.html").ToString();
-                                logger.Verify(AreEqualIgnoringSpace(navigationStartingUri, expectedUri),
+                            var startTask = MyWebView2.GetNavigationStartingTask();
+                            _ = MyWebView2.ExecuteScriptAsync("navigateToTextPage();");
+                            await startTask;
+                            string startingStatus = Status1.Text;
+                            string expectedStatus = "MyWebView2 navigation starting...";
+                            logger.Verify((startingStatus == expectedStatus),
+                                            string.Format("Test {0}: Failed, Expected navigation status: {1} did not match actual navigation status: {2}",
+                                                        selectedTest, expectedStatus, startingStatus));
+                            string navigationStartingUri = Status3.Text;
+                            string expectedUri = WebView2Common.GetTestPageUri("SimplePageWithText.html").ToString();
+                            logger.Verify(AreEqualIgnoringSpace(navigationStartingUri, expectedUri),
                                             string.Format("Test {0}: Failed, Expected NavigationStarting Uri {1} did not match actual NavigationStarting Uri {2}",
-                                                            selectedTest, expectedUri, navigationStartingUri));
-                            }
+                                                        selectedTest, expectedUri, navigationStartingUri));
+                            logger.Verify(_isUserInitiated,
+                                            string.Format("Test {0}: Failed, NavigationStartingArgs.IsUserInitiated value: {1}, did not match expected value: true",
+                                                        selectedTest, _isUserInitiated.ToString()));
+                            logger.Verify(!_isRedirected,
+                                            string.Format("Test {0}: Failed, NavigationStartingArgs.IsRedirected value: {1}, did not match expected value: false",
+                                                        selectedTest, _isRedirected.ToString()));
+                        }
+                        break;
+
+                    case TestList.NavigationStartingInvalidTest:
+                        {
+                            // Part 2: [SimplePage.html] navigates to http://www.blockedbynavigationstarting.invalid -> navigation cancelled via OnNavigationStarting.
+                            //         Ensure we are still on [SimplePage.html] at end.
+                            var startTask2 = MyWebView2.GetNavigationStartingTask();
+                            _ = MyWebView2.ExecuteScriptAsync("navigateToInvalidPage();");
+                            await startTask2;
+
+                            string navigationStartingUri = Status3.Text;
+                            string expectedUri = WebView2Common.GetTestPageUri("SimplePageWithText.html").ToString();
+                            logger.Verify(AreEqualIgnoringSpace(navigationStartingUri, expectedUri),
+                                        string.Format("Test {0}: Failed, Expected NavigationStarting Uri {1} did not match actual NavigationStarting Uri {2}",
+                                                        selectedTest, expectedUri, navigationStartingUri));
                         }
                         break;
 
@@ -1789,6 +1773,41 @@ async public void CompleteCurrentTest(object sender, RoutedEventArgs args)
                         }
                         break;
 
+                    case TestList.OffTreeWebViewInputTest:
+                        {
+                            // Create a new webview
+                            ApplicationTheme appTheme = Application.Current.RequestedTheme;
+                            Color backgroundColor = (appTheme == ApplicationTheme.Light) ? Colors.White : Colors.Black;
+                            var webView2 = new WebView2() {
+                                Name = "MyWebView2",
+                                Margin = new Thickness(8, 8, 8, 8)
+                            };
+                            AutomationProperties.SetName(webView2, "MyWebView2");
+                            AddWebViewEventHandlers(webView2);
+
+                            // Ensure the webview before we add it to the tree
+                            var task = webView2.EnsureCoreWebView2Async();
+                            await task;
+
+                            // Navigate
+                            var navCompletedTask = webView2.GetNavigationCompletedTask();
+                            WebView2Common.LoadWebPage(webView2, TestPageNames[TestInfoDictionary[selectedTest]]);
+                            await navCompletedTask;
+
+                            // Add the webview to the tree so we can see it
+                            var border = FindName("MyWebView2Border") as Border;
+                            border.Child = webView2;
+                        }
+                        break;
+                    case TestList.HtmlDropdownTest:
+                        {
+                            var selctedOption = await MyWebView2.ExecuteScriptAsync("getSelectedOption();");
+                            logger.Verify(selctedOption.Equals("\"2\""),
+                                string.Format("Test {0} Failed, Expected option \"2\" to be selcted, actually got {1}",
+                                    selectedTest, selctedOption));;
+                        }
+                        break;
+
                     default:
                         break;
 
@@ -1811,15 +1830,6 @@ async public void CleanupCurrentTest(object sender, RoutedEventArgs args)
             CleanupResultTextBox.Text = "Cleanup completed.";
         }
 
-        async private Task VerifySingleColorTest(TestList selectedTest, Color expectedColor, ResultsLogger logger)
-        {
-            Color sampledColor = await SamplePointColors(ShowRtb1);
-            bool result = sampledColor.Equals(expectedColor);
-            logger.Verify(result,
-                          string.Format("Test {0}: Expected color {1} did not match with sampled color {2}",
-                                        selectedTest.ToString(), expectedColor.ToString(), sampledColor.ToString()));
-        }
-
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         {
             if (TestNameComboBox.GetSelectedText() != "")
diff --git a/dev/WebView2/WebView2.cpp b/dev/WebView2/WebView2.cpp
index 8c30b788c9..2d97376b23 100644
--- a/dev/WebView2/WebView2.cpp
+++ b/dev/WebView2/WebView2.cpp
@@ -1747,7 +1747,21 @@ void WebView2::HandleRendered(const winrt::IInspectable& /*sender*/, const winrt
 
 void WebView2::CheckAndUpdateWebViewPosition()
 {
-    if (!m_coreWebViewController) return;
+    if (!m_coreWebViewController)
+    {
+        return;
+    }
+
+    // Skip this work if WebView2 has just been removed from the tree - otherwise the CWV2.Bounds update could cause a flicker.
+    //
+    // After WebView2 is removed from the tree, this handler gets run one more time during the frame's render pass 
+    // (WebView2::HandleRendered()). The removed element's ActualWidth or ActualHeight could now evaluate to zero 
+    // (if Width or Height weren't explicitly set), causing 0-sized Bounds to get applied below and clear the web content, 
+    // producing a flicker that last until DComp Commit for this frame is processed by the compositor.
+    if (!this->IsLoaded())
+    {
+        return;
+    }
 
     // Check if the position of the WebView within the window has changed
     auto transform = TransformToVisual(nullptr);
diff --git a/test/MUXControlsTestApp/Assets/SimpleInputPage.html b/test/MUXControlsTestApp/Assets/SimpleInputPage.html
index 1d05cd07e4..067efb7383 100644
--- a/test/MUXControlsTestApp/Assets/SimpleInputPage.html
+++ b/test/MUXControlsTestApp/Assets/SimpleInputPage.html
@@ -3,61 +3,69 @@
 <head>
     <title>Simple Input Page</title>
     <style>
-
-        h1 {
-            background-color: #0080ff
-        }
-
-        h2 {
-            background-color: #00ff80
-        }
-        .largeButton {
-        display: block;
-        width: 100%;
-        border: none;
-        background-color: #4CAF50;
-        color: white;
-        padding: 14px 28px;
-        font-size: 16px;
-        cursor: pointer;
-        text-align: center;
-        }
     </style>
     <script>
-        function sendInputMessage()
-        {
-            window.chrome.webview.postMessage("Input button clicked.");
+        function doPostMessage(message) {
+            // Do different things in WebView2 vs the browser, so neither gets an error
+            try {
+                window.chrome.webview.postMessage(message);
+            }
+            catch {
+                window.postMessage(message);
+            }
         };
 
-        function getFocus()
-        {
-            if (document.hasFocus())
-            {
-                var id = document.activeElement.id;
-                if (id == "textInput1")
-                {
-                    return 'w1';
-                }
-                else if (id == "enterInput")
-                {
-                    return 'b1';
-                }
-                else
-                {
-                    return 'unhandledWebviewControl';
-                }
+        function sendInputMessage() {
+            doPostMessage("Input button clicked.");
+        };
+
+        function onGotFocus(x) {
+            if (document.hasFocus()) {
+                var output = (x.id) ? x.id : x;
+                doPostMessage("Focus on: " + output);
+                console.log("Focus on: " + output);
             }
-            else
-            {
-                return 'n/a';
+            else {
+                doPostMessage("Focus on: n/a");
+            }
+        };
+
+        function onFocusOut() {
+            if (!document.hasFocus()) {
+                doPostMessage("Focus on: document lost focus");
+                console.log("Focus on: document lost focus");
             }
         };
+
+        function onGotBlur(x)
+        {
+            var output = (x.id) ? x.id : x;
+            doPostMessage("Blur on: " + output);
+            console.log("Blur on: " + output);
+        };
+
+        function getSelectedOption() {
+            var s1 = document.getElementById("s1");
+            var val = s1.value;
+            console.log("Value: " + val);
+            return val;
+        };
     </script>
 </head>
-<body>
+
+<body id="body" onfocus="onGotFocus(this)" onblur="onGotBlur(this)" onfocusout="onFocusOut()">
     <form>
-        TextBox: <input style="font-size:50px" type="text" id="textInput1" onblur="onGotBlur(this)" onfocus="onGotFocus(this)"><br>
+        TextBox: <input style="font-size:50px" type="text" id="w1" onblur="onGotBlur(this)" onfocus="onGotFocus(this)"><br>
     </form>
-    <button onclick="sendInputMessage()" id="enterInput"> Input button </button>
+
+    <button onclick="sendInputMessage()" id="b1" onblur="onGotBlur(this)" onfocus="onGotFocus(this)"> Input button </button>
+
+    <center>
+        <select name="select" id="s1" style="font-size:70px" onfocus="onGotFocus(this)">
+            <option value="1">Lorem</option>
+            <option value="2">Ipsum</option>
+            <option value="3">Dolor</option>
+        </select>
+    </center>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/MUXControlsTestApp/Assets/SimplePage.html b/test/MUXControlsTestApp/Assets/SimplePage.html
index 1834cc3488..13a477d9b1 100644
--- a/test/MUXControlsTestApp/Assets/SimplePage.html
+++ b/test/MUXControlsTestApp/Assets/SimplePage.html
@@ -1,84 +1,86 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Simple Page</title>
-<style>
-h1 {
-    background-color: #0080ff
-}
-h2 {
-    background-color: #00ff80
-}
-</style>
+    <title>Simple Page</title>
+    <style>
+    h1 {
+        background-color: #0080ff
+    }
+    h2 {
+        background-color: #00ff80
+    }
+    </style>
     <script>
-        function getFocus()
-        {
-            if (document.hasFocus())
-            {
-                var id = document.activeElement.id;
-                if (id == "hyperlink1")
-                {
-                    return 'w1B';
-                }
-                else
-                {
-                    return 'unhandledWebviewControl';
-                }
+        function doPostMessage(message) {
+            // Do different things in WebView2 vs the browser, so neither gets an error
+            try {
+                window.chrome.webview.postMessage(message);
+            }
+            catch {
+                window.postMessage(message);
             }
-            else
-            {
-                return 'n/a';
+        };
+
+        function onGotFocus(x) {
+            var output = (x.id) ? x.id : x;
+            doPostMessage("Focus on: " + output);
+            console.log("Focus on: " + output);
+        };
+
+        function onFocusOut() {
+            if (!document.hasFocus()) {
+                doPostMessage("Focus on: document lost focus");
+                console.log("Focus on: document lost focus");
             }
         };
 
-        function navigateToTextPage()
+        function onGotBlur(x)
         {
+            var output = (x.id) ? x.id : x;
+            doPostMessage("Blur on: " + output);
+            console.log("Blur on: " + output);
+        };
+
+        function navigateToTextPage() {
             window.location.assign('SimplePageWithText.html');
-        }
-        window.onresize = function()
-        {
+        };
+
+        window.onresize = function() {
             window.chrome.webview.postMessage("Webview resized.");
         };
 
-        function getWindowXPosition()
-        {
+        function getWindowXPosition() {
             return window.screenX;
-        }
+        };
 
-        function getWindowYPosition()
-        {
+        function getWindowYPosition() {
             return window.screenY;
         };
 
-        function getWindowWidth()
-        {
+        function getWindowWidth() {
             return window.innerWidth;
-        }
+        };
 
-        function getWindowHeight()
-        {
+        function getWindowHeight() {
             return window.innerHeight;
-        }
+        };
 
-        function updateLanguage()
-        {
+        function updateLanguage() {
             var userLang = navigator.language || navigator.UserLanguage;
             document.getElementById("languageInfo").innerHTML = userLang;
         };
 
-        function getLanguage()
-        {
+        function getLanguage() {
             return document.getElementById("languageInfo").innerHTML;
         };
 
-
     </script>
 </head>
-<body onload="updateLanguage()">
+<body id="body" onload="updateLanguage()" onfocus="onGotFocus(this)" onblur="onGotBlur(this)" onfocusout="onFocusOut()">
     <div id="rectangle" style="width:100px; height:100px; background-color:#ff8000"></div>
-    <h1><a id="hyperlink1" href="http://www.bing.com/">Visit Bing!</a> </h1>
-    <h2><a href="http://www.microsoft.com/">Visit Microsoft!</a> </h2>
-    <input id="button" type="submit" name="button" class="largeButton" onclick="navigateToTextPage();" value="Navigate Locally" />
-    Language : <h2 id="languageInfo">unknown</h2>
+    <h1><a id="w1B" href="http://www.bing.com/" onfocus="onGotFocus(this)" onblur="onGotBlur(this)">Visit Bing!</a></h1>
+    <h2><a id="w2B" href="http://www.microsoft.com/" onfocus="onGotFocus(this)" onblur="onGotBlur(this)">Visit Microsoft!</a></h2>
+    <input id="b1B" type="submit" name="button" onclick="navigateToTextPage()" onfocus="onGotFocus(this)" onblur="onGotBlur(this)" value="Navigate Locally" />
+    Language: <h2 id="languageInfo">unknown</h2>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/MUXControlsTestApp/Assets/SimplePageForFocus.html b/test/MUXControlsTestApp/Assets/SimplePageForFocus.html
index d93542dfe6..83a0f49e87 100644
--- a/test/MUXControlsTestApp/Assets/SimplePageForFocus.html
+++ b/test/MUXControlsTestApp/Assets/SimplePageForFocus.html
@@ -5,113 +5,72 @@
     <style>
     </style>
     <script>
-        var control1HasFocus = false;
-        var control2HasFocus = false;
-
-        var mouseButtons =
-        {
-            "left": 0,
-            "middle": 1,
-            "right": 2
-        };
-
-        var colorMappings =
-        {
-            "left": "#ff0000", //red
-            "middle": "#00ff00", //green
-            "right": "#0000ff", //blue
+        var colorMappings = {
             "control1_has_focus": "#800080", //purple
             "control2_has_focus": "#008080", //teal
             "no_control_has_focus": "#00FF00" //lime
         };
 
-
-        function changeColor(color)
-        {
+        function changeColor(color) {
             document.getElementById("rectangle").style.backgroundColor = color;
         };
 
-        var changeColorLeftClick = () => { changeColor(colorMappings.left); }     // red
-        var changeColorMiddleClick = () => { changeColor(colorMappings.middle); } // green
-        var changeColorRightClick = () => { changeColor(colorMappings.right); }   // blue
         var changeColorControl1HasFocus = () => { changeColor(colorMappings.control1_has_focus); }     // purple
         var changeColorControl2HasFocus = () => { changeColor(colorMappings.control2_has_focus); }     // teal
-        var changeColorNoControlHasFocus = () => { changeColor(colorMappings.no_control_has_focus); }     // lime
+        var changeColorNoControlHasFocus = () => { changeColor(colorMappings.no_control_has_focus); }  // lime
 
-        function onGotFocus(x)
-        {
-            if (x.id == "hyperLink1")
-            {
-                control1HasFocus = true;
-                changeColorControl1HasFocus();
-                console.log("w1 got focus");
+        function doPostMessage(message) {
+            // Do different things in WebView2 vs the browser, so neither gets an error
+            try {
+                window.chrome.webview.postMessage(message);
             }
-            else if (x.id == "textInput1")
-            {
-                control2HasFocus = true;
-                changeColorControl2HasFocus();
-                console.log("w2 got focus");
+            catch {
+                window.postMessage(message);
             }
         };
 
-        function getFocus()
-        {
-            if (document.hasFocus())
-            {
-                var id = document.activeElement.id;
-                if (id == "hyperLink1")
-                {
-                    return 'w1';
-                }
-                else if (id == "textInput1")
-                {
-                    return 'w2';
-                }
-                else
-                {
-                    return 'unhandledWebviewControl';
-                }
-            }
-            else
-            {
-                return 'n/a';
-            }
-        };
+        function onGotFocus(x) {
+            var output = (x.id) ? x.id : x;
+            doPostMessage("Focus on: " + output);
+            console.log("Focus on: " + output);
 
-        function onGotBlur(x)
-        {
-            if (x.id == "hyperLink1")
-            {
-                control1HasFocus = false;
+            if (x.id == "w1") {
                 changeColorControl1HasFocus();
-                console.log("w1 got blur");
             }
-            else if (x.id == "textInput1")
-            {
-                control2HasFocus = false;
+            else if (x.id == "w2") {
                 changeColorControl2HasFocus();
-                console.log("w2 got blur");
             }
+            else {
+                changeColorNoControlHasFocus();
+            }
+        };
 
-           if (control1HasFocus == false && control2HasFocus == false)
-           {
-               changeColorNoControlHasFocus();
-               console.log("No control has focus");
-           }
+        function onFocusOut() {
+            if (!document.hasFocus()) {
+                doPostMessage("Focus on: document lost focus");
+                console.log("Focus on: document lost focus");
+            }
         };
 
-        function handleVisibilityChange()
+        function onGotBlur(x)
         {
-           window.chrome.webview.postMessage("Visibility state is now " + document.visibilityState);
+            var output = (x.id) ? x.id : x;
+            doPostMessage("Blur on: " + output);
+            console.log("Blur on: " + output);
+        };
+
+        function handleVisibilityChange() {
+           doPostMessage("Visibility state is now " + document.visibilityState);
         };
         document.addEventListener('visibilitychange', handleVisibilityChange, false);
     </script>
 </head>
-<body>
+
+<body id="body" onfocus="onGotFocus(this)" onblur="onGotBlur(this)" onfocusout="onFocusOut()">
     <div id="rectangle" style="width:100px; height:100px; background-color:#ff8000"></div>
-    <a style="font-size:50px" id="hyperLink1" href="http://www.bing.com" onblur="onGotBlur(this)" onfocus="onGotFocus(this)">[w1] Visit Bing!</a> 
+    <a style="font-size:50px" id="w1" href="http://www.bing.com" onblur="onGotBlur(this)" onfocus="onGotFocus(this)">[w1] Visit Bing!</a> 
     <form>
-        [w2]: <input style="font-size:50px" type="text" id="textInput1" onblur="onGotBlur(this)" onfocus="onGotFocus(this)"><br>
+        [w2]: <input style="font-size:50px" type="text" id="w2" onblur="onGotBlur(this)" onfocus="onGotFocus(this)"><br>
     </form>
     <p>
         <b><i><font size="4">Legend:</font></i></b><br>
diff --git a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
index 9d060bc69c..78d6fef289 100644
--- a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
+++ b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="MSTest.TestFramework">
       <Version>2.1.2</Version>
     </PackageReference>
-	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />