diff --git a/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs b/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
index 2808c680e..8dddda1d3 100644
--- a/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
+++ b/Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
@@ -337,6 +337,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 					testRunner.Wait(1);
 					testRunner.ClickByName(rowItem);
 
+					MatterControlUtilities.LibraryEditSelectedItem(testRunner);
 					testRunner.ClickByName("Library Edit Item Button");
 
 					//Make sure that Export Item Window exists after Export button is clicked
diff --git a/Tests/MatterControl.AutomationTests/PartPreviewTests.cs b/Tests/MatterControl.AutomationTests/PartPreviewTests.cs
index 1ac5335d7..64aa37d41 100644
--- a/Tests/MatterControl.AutomationTests/PartPreviewTests.cs
+++ b/Tests/MatterControl.AutomationTests/PartPreviewTests.cs
@@ -29,7 +29,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 					MatterControlUtilities.NavigateToFolder(testRunner, "Local Library Row Item Collection");
 					testRunner.Wait(1);
 					testRunner.ClickByName("Row Item Calibration - Box");
-					testRunner.ClickByName("Row Item Calibration - Box Print Button");
+					testRunner.ClickByName("Row Item Calibration - Box View Button");
 					testRunner.Wait(1);
 
 					//Get View3DWidget and count MeshGroups before Copy button is clicked
@@ -47,16 +47,18 @@ namespace MatterHackers.MatterControl.Tests.Automation
 					
 					//Click Copy button and count MeshGroups 
 					testRunner.ClickByName(copyButtonName);
-					System.Threading.Thread.Sleep(2000);
+					System.Threading.Thread.Sleep(500);
 					int partCountAfterCopy = view3D.MeshGroups.Count();
 					resultsHarness.AddTestResult(partCountAfterCopy == 2);
 					testRunner.Wait(1);
 
 					//Click Copy button a second time and count MeshGroups again
 					testRunner.ClickByName(copyButtonName);
-					System.Threading.Thread.Sleep(2000);
+					System.Threading.Thread.Sleep(500);
 					int partCountAfterSecondCopy = view3D.MeshGroups.Count();
 					resultsHarness.AddTestResult(partCountAfterSecondCopy == 3);
+					view3D.CloseOnIdle();
+					System.Threading.Thread.Sleep(500);
 
 
 					MatterControlUtilities.CloseMatterControl(testRunner);
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 14dee4a90..698d6083e 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -337,6 +337,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			testRunner.ClickByName("LibraryActionMenu");
 			testRunner.ClickByName("Add to Queue Menu Item", 1);
 		}
+
+		public static void LibraryEditSelectedItem(AutomationRunner testRunner)
+		{
+			testRunner.ClickByName("LibraryActionMenu");
+			testRunner.ClickByName("Edit Menu Item", 1);
+		}
 	}
 
 	/// <summary>