diff --git a/patches/patch20220110-6.0-SNAPSHOT/patch.sh b/patches/patch20220110-6.0-SNAPSHOT/patch.sh
index 8c73b314582c189e8562bd4cd5899deb01278f56..739a6b835f02df72f1594c9cc49a459d603e65b6 100755
--- a/patches/patch20220110-6.0-SNAPSHOT/patch.sh
+++ b/patches/patch20220110-6.0-SNAPSHOT/patch.sh
@@ -39,7 +39,10 @@ check_version $OLD_VERSION
 
 mysql_execute_file $PATCH_DIR/patch.sql
 
+is_unit_test || mysql_execute "DROP PROCEDURE _create_dirs;"
+
 update_version $NEW_VERSION
 
+
 success
 
diff --git a/patches/patch20220110-6.0-SNAPSHOT/patch.sql b/patches/patch20220110-6.0-SNAPSHOT/patch.sql
index 2a6c7744f93fa7c08747c7b7a8e2e62a25abacc7..931ac7d3c20177dbd8271531b7099df6d632530f 100644
--- a/patches/patch20220110-6.0-SNAPSHOT/patch.sql
+++ b/patches/patch20220110-6.0-SNAPSHOT/patch.sql
@@ -211,5 +211,5 @@ DELIMITER ;
 
 CALL _create_dirs();
 
--- not to be uses after this patch has been applied.
+-- not to be used after this patch has been applied.
 -- DROP PROCEDURE _create_dirs;
diff --git a/procedures/deleteEntity.sql b/procedures/deleteEntity.sql
index 5574f3e3499a0802cd9ba176904b13016e966643..859f43cad7e6951f7eec94b99b5e2a2cc34dac10 100644
--- a/procedures/deleteEntity.sql
+++ b/procedures/deleteEntity.sql
@@ -43,6 +43,7 @@ BEGIN
 
     -- detele file properties
     DELETE FROM files where file_id=EntityID;
+    DELETE FROM files where parent_directory=EntityID;
 
     -- delete datatype stuff
     DELETE FROM data_type
diff --git a/utils/load_settings.sh b/utils/load_settings.sh
index c24a0f4baf6e9e15e56e7ffeacb265b0b5f01673..9d5fc61c261c1154b0d0a6d191de9eee767611f1 100644
--- a/utils/load_settings.sh
+++ b/utils/load_settings.sh
@@ -69,3 +69,4 @@ export DATABASE_NAME
 export DATABASE_USER
 export DATABASE_USER_PW
 export DATABASE_USER_HOST_LIST
+export IS_UNIT_TEST
diff --git a/utils/make_db b/utils/make_db
index c9fffc4589621e64a1877d0d2db1d744186b222e..dd72c4e51ddf186359c7436ac260d2919161a7c8 100755
--- a/utils/make_db
+++ b/utils/make_db
@@ -78,6 +78,7 @@ function _execute_tests () {
 # optional parameter: [--fresh] for installing a fresh data base. Otherwise an existing one would be reused.
 function _install_unit_test_database () {
     DATABASE_NAME=$UNITTEST_DATABASE
+    IS_UNIT_TEST=1
     if [[ $1 = "--fresh" ]] ; then
         if _db_exists "$DATABASE_NAME"; then
             drop "$DATABASE_NAME" ;
diff --git a/utils/patch_header.sh b/utils/patch_header.sh
index 33fbff879b3166596e153685105873adeae8405b..37483b0a98ec41a0ecc42ea2127ba729eef0d4a2 100644
--- a/utils/patch_header.sh
+++ b/utils/patch_header.sh
@@ -143,4 +143,11 @@ function redo_table {
          $MYSQL_CMD $(get_db_args) < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
 }
 
+function is_unit_test {
+    if [ -z "$IS_UNIT_TEST" ]; then
+        return 1;
+    fi
+    return 0;
+}
+