diff --git a/Tests/MatterControl.AutomationTests/PrintQueueTests.cs b/Tests/MatterControl.AutomationTests/PrintQueueTests.cs
index 723383072..a7e225fdc 100644
--- a/Tests/MatterControl.AutomationTests/PrintQueueTests.cs
+++ b/Tests/MatterControl.AutomationTests/PrintQueueTests.cs
@@ -604,7 +604,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		}
 
 		[Test, Apartment(ApartmentState.STA)]
-		public async Task ClickQueueRoWItemViewAndRemove()
+		public async Task ClickQueueRowItemViewAndRemove()
 		{
 			AutomationTest testToRun = (testRunner) =>
 			{
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 296b830b8..5d56c5413 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -239,32 +239,21 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 		public static void AddAndSelectPrinter(AutomationRunner testRunner, string make, string model)
 		{
-			testRunner.ClickByName("Printers... Menu", 2);
-			testRunner.Wait(.2);
+			testRunner.ClickByName("Printers... Menu", 2, delayBeforeReturn: .5);
+			
+			testRunner.ClickByName("Add New Printer... Menu Item", 5, delayBeforeReturn: .5);
 
-			testRunner.ClickByName("Add New Printer... Menu Item", 2);
-			testRunner.Wait(.2);
-
-			/* This prompt is no longer shown and causes a 2 second delay. Remove this block once confirmed
-			testRunner.ClickByName("Connection Wizard Skip Sign In Button", 2);
-			testRunner.Wait(.2); */
-
-			testRunner.ClickByName("Select Make", 2);
-			testRunner.Wait(.2);
+			testRunner.ClickByName("Select Make", 5, delayBeforeReturn: .5);
 
 			testRunner.Type(make);
 			testRunner.Type("{Enter}");
 
-			testRunner.ClickByName("Select Model", 2);
-			testRunner.Wait(.2);
+			testRunner.ClickByName("Select Model", 5, delayBeforeReturn: .5);
 
-			testRunner.ClickByName(model + " Menu Item", 2);
-			testRunner.Wait(.2);
+			testRunner.ClickByName(model + " Menu Item", 5, delayBeforeReturn: .5);
+			testRunner.ClickByName("Save & Continue Button", 5, delayBeforeReturn: 1); // wait for this window to close
 
-			testRunner.ClickByName("Save & Continue Button", 2);
-
-			testRunner.WaitForName("Cancel Wizard Button", 3);
-			testRunner.ClickByName("Cancel Wizard Button", 2);
+			testRunner.ClickByName("Cancel Wizard Button", 5, delayBeforeReturn: .5);
 			testRunner.Wait(1);
 		}