diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index b85dfc2ca..cce1ffe6b 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit b85dfc2ca23148fc745ece0fea92be788847a1dc
+Subproject commit cce1ffe6b07fb6d26ec1344c105536ce251e126a
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 52c26f838..5767cb1bb 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -310,13 +310,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			// Click 'Add Printer' if not on screen
 			if (!testRunner.NameExists("Select Make", 0.2))
 			{
-				if (!testRunner.NameExists("Create Printer", 0.1))
-				{
-					// go to the start page
-					testRunner.ClickByName("Hardware Tab");
-				}
-
-				testRunner.ClickByName("Create Printer");
+				testRunner.ClickByName("Print Button");
 			}
 
 			testRunner.ClickByName("Select Make");
@@ -333,7 +327,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 			// An unpredictable period of time will pass between Clicking Save, everything reloading and us returning to the caller.
 			// Block until ReloadAll has completed then close and return to the caller, at which point hopefully everything is reloaded.
-			testRunner.ClickByName("Save & Continue Button");
+			testRunner.ClickByName("Next Button");
 
 			testRunner.WaitFor(() => testRunner.WidgetExists<SetupStepComPortOne>());
 			testRunner.ClickByName("Cancel Wizard Button");