diff --git a/goofy-client/apps/goofy-e2e/cypress.config.ts b/goofy-client/apps/goofy-e2e/cypress.config.ts
index fd6fee3da4580645f7e50b12343812d99a0bacdd..f202506b3f402b3aa90fd1959a868b249fda09a8 100644
--- a/goofy-client/apps/goofy-e2e/cypress.config.ts
+++ b/goofy-client/apps/goofy-e2e/cypress.config.ts
@@ -94,28 +94,14 @@ export default defineConfig({
 					dropUserManagerCollectionsFromDatabase(config, collections);
 					return 0;
 				},
-				countDownloadFiles(folderName) {
-					return new Promise((resolve, reject) => {
-					fs.readdir(folderName, (err, files) => {
-						if (err) {
-						return reject(err)
-						}
-		
-						resolve(files.length)
-					})
-				})},
-				deleteDownloadFolder(folderName) {
-					console.log('deleting folder %s', folderName)
-			  
-					return new Promise((resolve, reject) => {
-					  rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
-						if (err) {
-						  console.error(err)
-						  return reject(err)
-						}
-						resolve(null)
-					  })
-					})
+				countFiles(folderName) {
+					console.log('counting files in folder %s', folderName);
+					return countFiles(folderName);					
+				},
+				deleteFolder(folderName) {
+					console.log('deleting folder %s', folderName);
+					deleteFolder(folderName);
+					return 0;
 				  },
 			});
 
@@ -370,4 +356,28 @@ function dropCollections(databaseUrl, databaseName, collections){
 			});
 		}
 	});
+}
+
+function countFiles(folderName): Promise<number> {
+	return new Promise((resolve, reject) => {
+		fs.readdir(folderName, (err, files) => {
+			if (err) {
+				return reject(err)
+			}
+
+			resolve(files.length)
+		})
+	})
+}
+
+function deleteFolder(folderName): void {
+	new Promise((resolve, reject) => {
+		rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
+		  if (err) {
+			console.error(err)
+			return reject(err)
+		  }
+		  resolve(null)
+		})
+	  })
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts b/goofy-client/apps/goofy-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts
index 8012254cf57d5dc52d53ffb3cd27a5b0bb2c6623..0e5cc6e24d453b4b316ee55d17045984eb1161ed 100644
--- a/goofy-client/apps/goofy-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts
+++ b/goofy-client/apps/goofy-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts
@@ -47,7 +47,6 @@ describe('Vorgang exportieren', () => {
 	const vorgangExportieren: VorgangE2E = { ...createVorgang(), name: 'DoExportieren' };
 
 	before(() => {
-		dropCollections();
 		initVorgaenge([vorgangExportieren]);
 
 		loginAsSabine();
@@ -85,7 +84,7 @@ describe('Vorgang exportieren', () => {
 			exist(menuItem.getButton());
 		})
 
-		it('should be 1 file in download folder', () => {
+		it('should have 1 file in download folder after download', () => {
 			menuItem.getButton().click();
 
 			waitForSpinnerToDisappear();
diff --git a/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts b/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts
index c8414803ec145db27e5e88d6a25b19bb208ae865..62b64501d57ac8bfed9e3492f184b01eae723a5f 100644
--- a/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts
+++ b/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts
@@ -37,8 +37,8 @@ enum CypressTasks {
 	INIT_VORGANG_DATA = 'initVorgangData',
 	INIT_VORGANG_ATTACHED_ITEM_DATA = 'initVorgangAttachedItemData',
 	INIT_USERMANAGER_DATA = 'initUsermanagerData',
-	COUNT_DOWNLOAD_FILES = 'countDownloadFiles',
-	DELETE_DOWNLOAD_FOLDER = 'deleteDownloadFolder'
+	COUNT_FILES = 'countFiles',
+	DELETE_FOLDER = 'deleteFolder'
 }
 
 enum MongoCollections {
@@ -113,11 +113,11 @@ export function dropCollections() {
 }
 
 export function countDownloadFiles(): Cypress.Chainable<number> {
-	return cy.task(CypressTasks.COUNT_DOWNLOAD_FILES, DOWNLOAD_FOLDER);
+	return cy.task(CypressTasks.COUNT_FILES, DOWNLOAD_FOLDER);
 }
 
-export function deleteDownloadFolder() {
-	cy.task(CypressTasks.DELETE_DOWNLOAD_FOLDER, DOWNLOAD_FOLDER);
+export function deleteDownloadFolder(): void {
+	cy.task(CypressTasks.DELETE_FOLDER, DOWNLOAD_FOLDER);
 }
 
 export function scrollToWindowBottom(): void {