diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index e56d012fee..7d01696e08 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -18,9 +18,6 @@ OCA\Encryption\Helper::registerUserHooks();
 // Sharing related hooks
 OCA\Encryption\Helper::registerShareHooks();
 
-// Webdav related hooks
-OCA\Encryption\Helper::registerWebdavHooks();
-
 // Filesystem related hooks
 OCA\Encryption\Helper::registerFilesystemHooks();
 
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index c57f0bc009..e4bf2c1226 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -58,16 +58,6 @@ class Helper
 		\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
 	}
 
-	/**
-	 * @brief register webdav related hooks
-	 *
-	 */
-	public static function registerWebdavHooks()
-	{
-
-
-	}
-
 	/**
 	 * @brief register filesystem related hooks
 	 *
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index f302aa0a3e..0b806394eb 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -557,8 +557,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 
 	function testRecoveryFile()
 	{
-		// login as admin
-		$this->loginHelper('admin');
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$this->view->unlink('/owncloud_private_key');
+		$this->view->unlink('/public-keys');
+
+		\OC_FileProxy::$enabled = $proxyStatus;
 
 		\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
@@ -566,6 +572,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		// check if control file created
 		$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
 
+		// login as admin
+		$this->loginHelper('admin');
+
 		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
 
 		// check if recovery password match
@@ -620,6 +629,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 		// check if share key for recovery not exists
 		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 		$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		\OCA\Encryption\Helper::adminDisableRecovery('test123');
+		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
 	}
 
 	function testRecoveryForUser()
@@ -689,6 +701,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(0));
+
+		\OCA\Encryption\Helper::adminDisableRecovery('test123');
+		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
 	}
 
 	function testFailShareFile()