diff --git a/tests/unit/e_marketplaceTest.php b/tests/unit/e_marketplaceTest.php
index 02256e4f5..0f612b47f 100644
--- a/tests/unit/e_marketplaceTest.php
+++ b/tests/unit/e_marketplaceTest.php
@@ -80,12 +80,14 @@ DATA
 
 			if(is_dir($path))
 			{
-				rename($path, $path."_old_".time());
+				e107::getFile()->removeDir($path);
+			//	rename($path, $path."_old_".time());
 			}
 
 			if(is_dir($tempPath))
 			{
-				rename($tempPath, $tempPath."_old_".time());
+				e107::getFile()->removeDir($tempPath);
+				// rename($tempPath, $tempPath."_old_".time());
 			}
 
 			$status = $this->mp->download($id,'','plugin' );
diff --git a/tests/unit/e_pluginTest.php b/tests/unit/e_pluginTest.php
index e3ba79a98..905d14875 100644
--- a/tests/unit/e_pluginTest.php
+++ b/tests/unit/e_pluginTest.php
@@ -61,6 +61,37 @@
 
 		}
 
+		public function testClearCache()
+		{
+
+			$detected = $this->ep->clearCache()->getDetected();
+			$num = e107::getDb()->count('plugin','(*)');
+			$det = count($detected);
+			$this->assertEquals($num,$det);
+
+			// Simulate an orphaned plugin entry.
+			$insert = array(
+			 'plugin_name'          => "testClearCache",
+			 'plugin_version'       => 1,
+			 'plugin_path'          => 'missing_path',
+			 'plugin_installflag'   => 1,
+			 'plugin_addons'        => '',
+			 'plugin_category'      => 'tools'
+			);
+
+			e107::getDb()->insert('plugin', $insert);
+
+
+			$detected = $this->ep->clearCache()->getDetected();
+			$num = e107::getDb()->count('plugin','(*)');
+			$det = count($detected);
+			$this->assertEquals($num,$det);
+
+		}
+
+
+
+
 		public function testBuildAddonPrefList()
 		{