diff --git a/PrintLibrary/Provider/LibraryProviderFileSystem.cs b/PrintLibrary/Provider/LibraryProviderFileSystem.cs
index 70bd0c2e8..36437cd5d 100644
--- a/PrintLibrary/Provider/LibraryProviderFileSystem.cs
+++ b/PrintLibrary/Provider/LibraryProviderFileSystem.cs
@@ -36,7 +36,9 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
+using System.Threading;
 
 namespace MatterHackers.MatterControl.PrintLibrary.Provider
 {
@@ -176,7 +178,14 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
 			string directoryPath = collectionToRemove.Key;
 			if (Directory.Exists(directoryPath))
 			{
+				Stopwatch time = Stopwatch.StartNew();
 				Directory.Delete(directoryPath);
+				// Wait for up to some amount of time for the directory to be gone.
+				while (Directory.Exists(directoryPath) 
+					&& time.ElapsedMilliseconds < 100)
+				{
+					Thread.Sleep(1); // make sure we are not eating all the cpu time.
+				}
 				GetFilesAndCollectionsInCurrentDirectory();
 				LibraryProvider.OnDataReloaded(null);
 			}
@@ -187,6 +196,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
 			File.Delete(printItemWrapper.PrintItem.FileLocation);
 			GetFilesAndCollectionsInCurrentDirectory();
 			LibraryProvider.OnDataReloaded(null);
+			LibraryProvider.OnItemRemoved(null);
 		}
 
 		public override void SaveToLibrary(PrintItemWrapper printItemWrapper, List<MeshGroup> meshGroupsToSave, List<ProviderLocatorNode> providerSavePath)
@@ -212,7 +222,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
 				// and copy the file
 				try
 				{
-					if (!File.Exists(file))
+					if (!File.Exists(outputFileName))
 					{
 						File.Copy(file, outputFileName);
 					}
diff --git a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
index 2af1a99f5..f0feb9385 100644
--- a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
+++ b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs
@@ -27,62 +27,37 @@ of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 */
 
-using MatterHackers.MatterControl;
+using MatterHackers.Agg.PlatformAbstract;
+using MatterHackers.MatterControl.DataStorage;
+using MatterHackers.MatterControl.PrintLibrary.Provider;
+using MatterHackers.MatterControl.PrintQueue;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using MatterHackers.MatterControl.PrintLibrary.Provider;
-using MatterHackers.MatterControl.PrintQueue;
-using MatterHackers.MatterControl.DataStorage;
 using System.IO;
-using MatterHackers.Agg.PlatformAbstract;
 using System.Threading;
 
 namespace MatterControl.Tests
 {
-    [TestFixture]
-    public class LibraryProviderTests
-    {
-		string pathToMesh = Path.Combine("..", "..", "..", "TestData", "TestMeshes", "LibraryProviderData");
-		string meshFileName = "Box20x20x10.stl";
-		string meshPathAndFileName;
-
-		bool dataReloaded = false;
-		bool itemAdded = false;
-		bool itemRemoved = false;
-		private event EventHandler unregisterEvents;
+	[TestFixture]
+	public class LibraryProviderTests
+	{
+		private bool dataReloaded = false;
+		private bool itemAdded = false;
+		private bool itemRemoved = false;
+		private string meshFileName = "Box20x20x10.stl";
+		private string meshPathAndFileName;
+		private string pathToMesh = Path.Combine("..", "..", "..", "TestData", "TestMeshes", "LibraryProviderData");
 
 		public LibraryProviderTests()
 		{
-#if !__ANDROID__
+			#if !__ANDROID__
 			// Set the static data to point to the directory of MatterControl
 			StaticData.Instance = new MatterHackers.Agg.FileSystemStaticData(Path.Combine("..", "..", "..", ".."));
-#endif
+			#endif
 		}
 
-		[SetUp]
-		public void SetupBeforeTest()
-		{
-			meshPathAndFileName = Path.Combine(pathToMesh, meshFileName);
-
-			dataReloaded = false;
-			itemAdded = false;
-			itemRemoved = false;
-
-			LibraryProvider.DataReloaded.RegisterEvent((sender, e) => { dataReloaded = true; }, ref unregisterEvents);
-			LibraryProvider.ItemAdded.RegisterEvent((sender, e) => { itemAdded = true; }, ref unregisterEvents);
-			LibraryProvider.ItemRemoved.RegisterEvent((sender, e) => { itemRemoved = true; }, ref unregisterEvents);
-		}
-
-		[TearDown]
-		public void TeardownAfterTest()
-		{
-			unregisterEvents(this, null);
-		}
+		private event EventHandler unregisterEvents;
 
 		[Test, Category("LibraryProviderFileSystem")]
 		public void LibraryProviderFileSystem_NavigationWorking()
@@ -147,40 +122,9 @@ namespace MatterControl.Tests
 			Assert.IsTrue(!Directory.Exists(createdDirectory));
 		}
 
-		private bool NamedCollectionExists(string nameToLookFor)
-		{
-			string query = string.Format("SELECT * FROM PrintItemCollection WHERE Name = '{0}' ORDER BY Name ASC;", nameToLookFor);
-			IEnumerable<PrintItemCollection> result = (IEnumerable<PrintItemCollection>)Datastore.Instance.dbSQLite.Query<PrintItemCollection>(query);
-			foreach (PrintItemCollection collection in result)
-			{
-				if (collection.Name == nameToLookFor)
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		private bool NamedItemExists(string nameToLookFor)
-		{
-			string query = string.Format("SELECT * FROM PrintItem WHERE Name = '{0}' ORDER BY Name ASC;", nameToLookFor);
-			IEnumerable<PrintItem> result = (IEnumerable<PrintItem>)Datastore.Instance.dbSQLite.Query<PrintItem>(query);
-			foreach (PrintItem collection in result)
-			{
-				if (collection.Name == nameToLookFor)
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-
 		[Test, Category("LibraryProviderSqlite")]
 		public void LibraryProviderSqlite_NavigationWorking()
-        {
+		{
 			Datastore.Instance.Initialize();
 			LibraryProviderSQLite testProvider = new LibraryProviderSQLite(null, null);
 			Thread.Sleep(3000); // wait for the library to finish initializing
@@ -235,7 +179,56 @@ namespace MatterControl.Tests
 			Assert.IsTrue(dataReloaded == true);
 			Assert.IsTrue(testProvider.CollectionCount == 0);
 			Assert.IsTrue(!NamedCollectionExists(collectionName)); // assert that the record does not exist in the DB
-
 		}
-    }
-}
+
+		[SetUp]
+		public void SetupBeforeTest()
+		{
+			meshPathAndFileName = Path.Combine(pathToMesh, meshFileName);
+
+			dataReloaded = false;
+			itemAdded = false;
+			itemRemoved = false;
+
+			LibraryProvider.DataReloaded.RegisterEvent((sender, e) => { dataReloaded = true; }, ref unregisterEvents);
+			LibraryProvider.ItemAdded.RegisterEvent((sender, e) => { itemAdded = true; }, ref unregisterEvents);
+			LibraryProvider.ItemRemoved.RegisterEvent((sender, e) => { itemRemoved = true; }, ref unregisterEvents);
+		}
+
+		[TearDown]
+		public void TeardownAfterTest()
+		{
+			unregisterEvents(this, null);
+		}
+
+		private bool NamedCollectionExists(string nameToLookFor)
+		{
+			string query = string.Format("SELECT * FROM PrintItemCollection WHERE Name = '{0}' ORDER BY Name ASC;", nameToLookFor);
+			IEnumerable<PrintItemCollection> result = (IEnumerable<PrintItemCollection>)Datastore.Instance.dbSQLite.Query<PrintItemCollection>(query);
+			foreach (PrintItemCollection collection in result)
+			{
+				if (collection.Name == nameToLookFor)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private bool NamedItemExists(string nameToLookFor)
+		{
+			string query = string.Format("SELECT * FROM PrintItem WHERE Name = '{0}' ORDER BY Name ASC;", nameToLookFor);
+			IEnumerable<PrintItem> result = (IEnumerable<PrintItem>)Datastore.Instance.dbSQLite.Query<PrintItem>(query);
+			foreach (PrintItem collection in result)
+			{
+				if (collection.Name == nameToLookFor)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+	}
+}
\ No newline at end of file