diff --git a/src/main/java/de/w665/sharepulse/db/RethinkDBService.java b/src/main/java/de/w665/sharepulse/db/RethinkDBService.java
index f4c89df..879e9c8 100644
--- a/src/main/java/de/w665/sharepulse/db/RethinkDBService.java
+++ b/src/main/java/de/w665/sharepulse/db/RethinkDBService.java
@@ -56,26 +56,29 @@ public class RethinkDBService {
         // rethinkdb check if database exists
         try {
             r.dbCreate(config.getDatabase()).run(connection).stream();
-            log.info("Database " + config.getDatabase() + " created");
+            log.debug("Database " + config.getDatabase() + " created");
         } catch (ReqlOpFailedError e) {
-            log.info("Database " + config.getDatabase() + " already exists. Error: " + e.getClass().getSimpleName());
+            log.debug("Database " + config.getDatabase() + " already exists. Error: " + e.getClass().getSimpleName());
         }
 
         // rethinkdb check if table file_uploads exists
         try {
             r.db(config.getDatabase()).tableCreate("file_uploads").run(connection).stream();
-            log.info("Table 'file_uploads' created successfully.");
+            log.debug("Table 'file_uploads' created successfully.");
         } catch (ReqlOpFailedError e) {
-            log.info("Table 'file_uploads' already exists. No action needed.");
+            log.debug("Table 'file_uploads' already exists. Clearing content...");
+            r.db(config.getDatabase()).table("file_uploads").delete().run(connection);
+            log.debug("Table 'file_uploads' cleared successfully.");
         }
 
         // rethinkdb check if table id_store exists
         try {
             r.db(config.getDatabase()).tableCreate("id_store").run(connection).stream();
-            log.info("Table 'id_store' created successfully.");
+            log.debug("Table 'id_store' created successfully.");
         } catch (ReqlOpFailedError e) {
-            log.info("Table 'id_store' already exists. No action needed.");
+            log.debug("Table 'id_store' already exists. No action needed.");
         }
+        log.info("Database ready for operation!");
     }
 
     @PreDestroy
diff --git a/src/main/java/de/w665/sharepulse/rest/TestRestResource.java b/src/main/java/de/w665/sharepulse/rest/TestRestResource.java
index 9f40a9e..d312609 100644
--- a/src/main/java/de/w665/sharepulse/rest/TestRestResource.java
+++ b/src/main/java/de/w665/sharepulse/rest/TestRestResource.java
@@ -5,6 +5,7 @@ import de.w665.sharepulse.model.FileUpload;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -18,10 +19,8 @@ public class TestRestResource extends ApiRestController {
     }
 
     @GetMapping("test")
-    public String test() {
-
-        FileUpload fileUpload = fileUploadRepository.retrieveFileUploadByFileId("2402041");
-
-        return fileUpload.toString();
+    public String test(@RequestParam String id) {
+        FileUpload fileUpload = fileUploadRepository.retrieveFileUploadByFileId(id);
+        return fileUpload != null ? fileUpload.toString() : "FileUpload not found for id: " + id;
     }
 }
diff --git a/src/main/java/de/w665/sharepulse/service/FileService.java b/src/main/java/de/w665/sharepulse/service/FileService.java
index 971b834..c8b487d 100644
--- a/src/main/java/de/w665/sharepulse/service/FileService.java
+++ b/src/main/java/de/w665/sharepulse/service/FileService.java
@@ -5,6 +5,7 @@ import de.w665.sharepulse.model.FileUpload;
 import jakarta.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.http.fileupload.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -66,13 +67,15 @@ public class FileService {
     @PostConstruct
     public void createFolder() {
         Path path = Paths.get(getTempDirPath());
-        log.debug("Creating directory " + path.getFileName());
+        log.debug("Checking temp file directory " + path.getFileName());
         try {
             if (!Files.exists(path)) {
                 Files.createDirectory(path);
                 log.debug("Directory created");
             } else {
-                log.debug("Directory already exists");
+                log.debug("Directory already exists. Clearing content.");
+                FileUtils.cleanDirectory(new File(getTempDirPath()));
+                log.debug("Directory content cleared.");
             }
         } catch (IOException e) {
             e.printStackTrace();