diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 7a1b3f44e..8921952af 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 7a1b3f44eae36dea8787167a57f91e39f9ce5951
+Subproject commit 8921952af4a05a90f690c525168e23bd322b4095
diff --git a/Tests/MatterControl.AutomationTests/PrintQueueTests.cs b/Tests/MatterControl.AutomationTests/PrintQueueTests.cs
index ff8f4f1c5..646a3e8b5 100644
--- a/Tests/MatterControl.AutomationTests/PrintQueueTests.cs
+++ b/Tests/MatterControl.AutomationTests/PrintQueueTests.cs
@@ -686,31 +686,21 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			{
 				testRunner.CloseSignInAndPrinterSelect();
 
-				/* Tests that when the Queue Copy button is clicked:
-				* 1. QueueCount = Zero
-				* 2. Add button can add single .amf file to the queue 
-				* 3. Queue count inceases by one 
-				*/
-				int queueCountBeforeTest = QueueData.Instance.ItemCount;
+				int initialQueueCount = QueueData.Instance.ItemCount;
 
-				//Click Add button 
-				testRunner.ClickByName("Queue Add Button", 2);
+				// Click Add button 
+				testRunner.ClickByName("Queue Add Button");
 				testRunner.Wait(1);
 
-				string pathToType = MatterControlUtilities.GetTestItemPath("Rook.amf");
-
-				testRunner.Type(pathToType);
+				testRunner.Type(MatterControlUtilities.GetTestItemPath("Rook.amf"));
 				testRunner.Wait(1);
 				testRunner.Type("{Enter}");
 
-				//Make sure Queue Count increases by one 
-				int queueCountAfterAMFIsAdded = QueueData.Instance.ItemCount;
+				// Widget should exist
+				Assert.IsTrue(testRunner.WaitForName("Queue Item Rook", 5), "Widget for added item should exist in control tree");
 
-				Assert.IsTrue(queueCountAfterAMFIsAdded == queueCountBeforeTest + 1);
-
-				//Make sure amf queue item is added 
-				bool firstQueueItemExists = testRunner.WaitForName("Queue Item Rook", 1);
-				Assert.IsTrue(firstQueueItemExists == true);
+				// Queue count should increases by one 
+				Assert.AreEqual(initialQueueCount + 1, QueueData.Instance.ItemCount, "After adding item, queue count should increase by one");
 
 				return Task.FromResult(0);
 			};
@@ -725,30 +715,21 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			{
 				testRunner.CloseSignInAndPrinterSelect();
 
-				/* Tests that when the Queue Copy button is clicked:
-				* 1. QueueCount = Zero
-				* 2. Add button can add single .stl file to the queue 
-				* 3. Queue count inceases by one 
-				*/
-				int queueCountBeforeTest = QueueData.Instance.ItemCount;
+				int initialQueueCount = QueueData.Instance.ItemCount;
 
-				//Click Add button 
-				testRunner.ClickByName("Queue Add Button", 2);
+				// Click Add button 
+				testRunner.ClickByName("Queue Add Button");
 				testRunner.Wait(1);
 
-				string pathToType = MatterControlUtilities.GetTestItemPath("Batman.stl");
-
-				testRunner.Type(pathToType);
+				testRunner.Type(MatterControlUtilities.GetTestItemPath("Batman.stl"));
 				testRunner.Wait(1);
 				testRunner.Type("{Enter}");
 
-				int queueCountAfterSTLIsAdded = QueueData.Instance.ItemCount;
+				// Widget should exist
+				Assert.IsTrue(testRunner.WaitForName("Queue Item Batman", 5), "Widget for added item should exist in control tree");
 
-				Assert.IsTrue(queueCountAfterSTLIsAdded == queueCountBeforeTest + 1);
-
-				//stl queue item is added to the queue
-				bool firstQueueItemExists = testRunner.WaitForName("Queue Item Batman", 1);
-				Assert.IsTrue(firstQueueItemExists == true);
+				// Queue count should increases by one 
+				Assert.AreEqual(initialQueueCount + 1, QueueData.Instance.ItemCount, "After adding item, queue count should increase by one");
 
 				return Task.FromResult(0);
 			};
@@ -763,25 +744,21 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			{
 				testRunner.CloseSignInAndPrinterSelect();
 
-				int queueCountBeforeTest = QueueData.Instance.ItemCount;
+				int initialQueueCount = QueueData.Instance.ItemCount;
 
-				//Click Add button 
-				testRunner.ClickByName("Queue Add Button", 2);
+				// Click Add button 
+				testRunner.ClickByName("Queue Add Button");
 				testRunner.Wait(1);
 
-				string pathToType = MatterControlUtilities.GetTestItemPath("chichen-itza_pyramid.gcode");
-
-				testRunner.Type(pathToType);
+				testRunner.Type(MatterControlUtilities.GetTestItemPath("chichen-itza_pyramid.gcode"));
 				testRunner.Wait(1);
 				testRunner.Type("{Enter}");
 
-				int queueCountAfterGcodeIsAdded = QueueData.Instance.ItemCount;
+				// Widget should exist
+				Assert.IsTrue(testRunner.WaitForName("Queue Item chichen-itza_pyramid", 5), "Widget for added item should exist in control tree");
 
-				Assert.IsTrue(queueCountAfterGcodeIsAdded == queueCountBeforeTest + 1);
-
-				//stl queue item is added to the queue
-				bool firstQueueItemExists = testRunner.WaitForName("Queue Item chichen-itza_pyramid", 1);
-				Assert.IsTrue(firstQueueItemExists == true);
+				// Queue count should increases by one 
+				Assert.AreEqual(initialQueueCount + 1, QueueData.Instance.ItemCount, "After adding item, queue count should increase by one");
 
 				return Task.FromResult(0);
 			};
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index b76863f66..a4fb8e406 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -198,7 +198,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 			testRunner.ClickByName("Serial Port Dropdown", 3);
 
-			testRunner.ClickByName(config.MCPort + " Menu Item", 1);
+			testRunner.ClickByName(config.MCPort + " Menu Item", 5);
 
 			testRunner.ClickByName("Cancel Wizard Button");
 
@@ -346,11 +346,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		{
 			SearchRegion libraryRowItemRegion = testRunner.GetRegionByName(libraryRowItemName, 3);
 			testRunner.ClickByName(libraryRowItemName);
-			//testRunner.MoveToByName(libraryRowItemName);
-			//testRunner.Wait(.5);
+			testRunner.Wait(.5);
 
 			testRunner.ClickByName("Open Collection", searchRegion: libraryRowItemRegion);
-			//testRunner.Wait(.5);
+			testRunner.Wait(.5);
 		}
 
 		public static async Task RunTest(