diff --git a/samples/Sandbox/MainWindow.axaml.cs b/samples/Sandbox/MainWindow.axaml.cs
index 6ee959e102f..8d4ca86e6f6 100644
--- a/samples/Sandbox/MainWindow.axaml.cs
+++ b/samples/Sandbox/MainWindow.axaml.cs
@@ -1,10 +1,5 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.Input.TextInput;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Avalonia.Win32.WinRT.Composition;
 
 namespace Sandbox
 {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
index c8806461f36..4c959cb2e3b 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/EventTests.cs
@@ -80,21 +80,20 @@ public void Attached_Event_Is_Assigned2()
         }
 
         [Fact]
-        public void Attached_Event_Ruted_Event_Handler()
+        public void Attached_Event_Routed_Event_Handler()
         {
-            var xaml = @"<Panel xmlns='https://github.com/avaloniaui' Button.Click='OnClick'><Button/></Panel>";
-            var target = new MyButton();
+            var xaml = @"<Panel xmlns='https://github.com/avaloniaui' Button.Click='OnClick'><Button Name='target'/></Panel>";
             var host = new MyPanel();
-            host.Children.Add(target);
 
             AvaloniaRuntimeXamlLoader.Load(xaml, rootInstance: host);
 
+            var target = host.FindControl<Button>("target");
             target.RaiseEvent(new RoutedEventArgs
             {
                 RoutedEvent = Button.ClickEvent,
             });
 
-            Assert.True(target.WasTapped);
+            Assert.True(host.WasClicked);
         }
 
         public class MyButton : Button