diff --git a/PrivacyCrashCam/app/src/androidTest/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManagerTest.java b/PrivacyCrashCam/app/src/androidTest/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManagerTest.java
index fb3e436..72169d5 100644
--- a/PrivacyCrashCam/app/src/androidTest/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManagerTest.java
+++ b/PrivacyCrashCam/app/src/androidTest/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManagerTest.java
@@ -8,10 +8,14 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.File;
+
 import de.pcc.privacycrashcam.data.Account;
 import de.pcc.privacycrashcam.data.Settings;
+import de.pcc.privacycrashcam.data.Video;
 
 /**
  * @author Giorgio Gross
@@ -80,45 +84,73 @@ public void getTempMetaDataFileTest() {
         Assert.assertTrue(memoryManager.getTempMetadataFile() != null);
     }
 
+    @Ignore
     @Test
     public void deleteEncryptedSymmetricKeyFileTest() {
+        Assert.assertTrue(memoryManager.deleteEncryptedSymmetricKeyFile(
+                memoryManager.createEncryptedSymmetricKeyFile("test").getName()
+        ));
     }
 
+    @Ignore
     @Test
     public void deleteEncryptedMetadataFileTest() {
-
+        Assert.assertTrue(memoryManager.deleteEncryptedMetadataFile(
+                memoryManager.createEncryptedMetaFile("test").getName()
+        ));
     }
 
+    @Ignore
     @Test
     public void deleteReadableMetadataTest() {
-
+        File test = memoryManager.createReadableMetadataFile("test");
+        Assert.assertTrue(memoryManager.deleteReadableMetadata("test"));
     }
 
+    @Ignore
     @Test
     public void deleteEncryptedVideoFileTest() {
-
+        File test = memoryManager.createEncryptedVideoFile("test");
+        Assert.assertTrue(memoryManager.deleteEncryptedVideoFile("test"));
     }
 
     @Test
     public void createEncryptedSymmetricKeyFileTest() {
-
+        Assert.assertTrue(
+                memoryManager.createEncryptedSymmetricKeyFile(
+                        "test").getName().equals("KEY_test.key")
+        );
+        memoryManager.deleteEncryptedSymmetricKeyFile("test");
     }
 
     @Test
     public void createEncryptedVideoFileTest() {
-
+        Assert.assertTrue(
+                memoryManager.createEncryptedVideoFile(
+                        "test").getName().equals("VIDEO_test.mp4")
+        );
+        memoryManager.createEncryptedVideoFile("test");
     }
 
     @Test
     public void createEncryptedMetaFileTest() {
-
+        Assert.assertTrue(
+                memoryManager.createEncryptedMetaFile(
+                        "test").getName().equals("META_test.json")
+        );
+        memoryManager.deleteEncryptedMetadataFile("test");
     }
 
     @Test
     public void createReadableMetadataFileTest() {
-
+        Assert.assertTrue(
+                memoryManager.createReadableMetadataFile(
+                        "test").getName().equals("META_R_test.json")
+        );
+        memoryManager.deleteReadableMetadata("test");
     }
 
+    @Ignore
     @Test
     public void getAllVideosTest() {
 
diff --git a/PrivacyCrashCam/app/src/main/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManager.java b/PrivacyCrashCam/app/src/main/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManager.java
index 8600d8f..ce952c7 100644
--- a/PrivacyCrashCam/app/src/main/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManager.java
+++ b/PrivacyCrashCam/app/src/main/java/de/pcc/privacycrashcam/data/memoryaccess/MemoryManager.java
@@ -322,12 +322,13 @@ private void recDeleteDir(File dir) {
      *
      * @param videoTag Tag of the video the file is associated with
      */
-    public void deleteEncryptedSymmetricKeyFile(String videoTag) {
+    public boolean deleteEncryptedSymmetricKeyFile(String videoTag) {
         File dir = getFilesDir(File.separator + KEY_DIR);
         if(dir.exists()) {
             File file = new File(dir, KEY_PREFIX + videoTag + "." + KEY_SUFFIX);
             if (file.exists()) {
                 file.delete();
+                return true;
             } else {
                 Log.d(TAG, "File: " + KEY_PREFIX + videoTag + "." + KEY_SUFFIX + " in dir: " +
                         KEY_DIR + "does not exist!");
@@ -335,6 +336,7 @@ public void deleteEncryptedSymmetricKeyFile(String videoTag) {
         } else {
             Log.d(TAG, KEY_DIR + " dir not existing");
         }
+        return false;
     }
 
     /**
@@ -404,7 +406,7 @@ public boolean deleteEncryptedVideoFile(String videoTag) {
                 return true;
             } else {
                 Log.d(TAG, "File: " + Video.PREFIX + videoTag + "." + Video.SUFFIX + " in dir: " +
-                        VIDEO_DIR + "does not exist!");
+                        VIDEO_DIR + " does not exist!");
             }
         } else {
             Log.d(TAG, VIDEO_DIR + " dir not existing");