diff --git a/tests/acceptance/bootstrap/FilesVersionsContext.php b/tests/acceptance/bootstrap/FilesVersionsContext.php
index 8f7ad0c82..2b6b77c20 100644
--- a/tests/acceptance/bootstrap/FilesVersionsContext.php
+++ b/tests/acceptance/bootstrap/FilesVersionsContext.php
@@ -359,41 +359,6 @@ class FilesVersionsContext implements Context {
 		);
 	}
 
-	/**
-	 * @Then /^as (?:users|user) "([^"]*)" the authors of the versions of file "([^"]*)" should be:$/
-	 *
-	 * @param string $users comma-separated list of usernames
-	 * @param string $filename
-	 * @param TableNode $table
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function asUsersAuthorsOfVersionsOfFileShouldBe(
-		string $users,
-		string $filename,
-		TableNode $table
-	): void {
-		$this->featureContext->verifyTableNodeColumns(
-			$table,
-			['index', 'author']
-		);
-		$requiredVersionMetadata = $table->getHash();
-		$usersArray = \explode(",", $users);
-		foreach ($usersArray as $username) {
-			$actualUsername = $this->featureContext->getActualUsername($username);
-			$this->featureContext->setResponse(
-				$this->getFileVersionMetadata($actualUsername, $filename)
-			);
-			foreach ($requiredVersionMetadata as $versionMetadata) {
-				$this->featureContext->checkAuthorOfAVersionOfFile(
-					$versionMetadata['index'],
-					$versionMetadata['author']
-				);
-			}
-		}
-	}
-
 	/**
 	 * @param string $user
 	 * @param string $path
diff --git a/tests/acceptance/bootstrap/OCSContext.php b/tests/acceptance/bootstrap/OCSContext.php
index 8a4f3f166..ae841b362 100644
--- a/tests/acceptance/bootstrap/OCSContext.php
+++ b/tests/acceptance/bootstrap/OCSContext.php
@@ -37,40 +37,40 @@ require_once 'bootstrap.php';
 class OCSContext implements Context {
 	private FeatureContext $featureContext;
 
-	// /**
-	//  * @When /^the user sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)"$/
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  *
-	//  * @return void
-	//  */
-	// public function theUserSendsToOcsApiEndpoint(string $verb, string $url): void {
-	// 	$response = $this->theUserSendsToOcsApiEndpointWithBody($verb, $url);
-	// 	$this->featureContext->setResponse($response);
-	// }
+	/**
+	 * @When /^the user sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)"$/
+	 *
+	 * @param string $verb
+	 * @param string $url
+	 *
+	 * @return void
+	 */
+	public function theUserSendsToOcsApiEndpoint(string $verb, string $url): void {
+		$response = $this->theUserSendsToOcsApiEndpointWithBody($verb, $url);
+		$this->featureContext->setResponse($response);
+	}
 
-	// /**
-	//  * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)"$/
-	//  * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" using password "([^"]*)"$/
-	//  *
-	//  * @param string $user
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param string|null $password
-	//  *
-	//  * @return void
-	//  */
-	// public function userSendsToOcsApiEndpoint(string $user, string $verb, string $url, ?string $password = null): void {
-	// 	$response = $this->sendRequestToOcsEndpoint(
-	// 		$user,
-	// 		$verb,
-	// 		$url,
-	// 		null,
-	// 		$password
-	// 	);
-	// 	$this->featureContext->setResponse($response);
-	// }
+	/**
+	 * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)"$/
+	 * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" using password "([^"]*)"$/
+	 *
+	 * @param string $user
+	 * @param string $verb
+	 * @param string $url
+	 * @param string|null $password
+	 *
+	 * @return void
+	 */
+	public function userSendsToOcsApiEndpoint(string $user, string $verb, string $url, ?string $password = null): void {
+		$response = $this->sendRequestToOcsEndpoint(
+			$user,
+			$verb,
+			$url,
+			null,
+			$password
+		);
+		$this->featureContext->setResponse($response);
+	}
 
 	/**
 	 * @param string $user
@@ -162,60 +162,6 @@ class OCSContext implements Context {
 		);
 	}
 
-	// /**
-	//  * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" with body$/
-	//  *
-	//  * @param string $user
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param TableNode|null $body
-	//  * @param string|null $password
-	//  *
-	//  * @return void
-	//  */
-	// public function userSendHTTPMethodToOcsApiEndpointWithBody(
-	// 	string $user,
-	// 	string $verb,
-	// 	string $url,
-	// 	?TableNode $body = null,
-	// 	?string $password = null
-	// ): void {
-	// 	$response = $this->sendRequestToOcsEndpoint(
-	// 		$user,
-	// 		$verb,
-	// 		$url,
-	// 		$body,
-	// 		$password
-	// 	);
-	// 	$this->featureContext->setResponse($response);
-	// }
-
-	// /**
-	//  * @When the administrator sends HTTP method :verb to OCS API endpoint :url
-	//  * @When the administrator sends HTTP method :verb to OCS API endpoint :url using password :password
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param string|null $password
-	//  *
-	//  * @return void
-	//  */
-	// public function theAdministratorSendsHttpMethodToOcsApiEndpoint(
-	// 	string $verb,
-	// 	string $url,
-	// 	?string $password = null
-	// ): void {
-	// 	$this->featureContext->setResponse(
-	// 		$this->sendRequestToOcsEndpoint(
-	// 			$this->featureContext->getAdminUsername(),
-	// 			$verb,
-	// 			$url,
-	// 			null,
-	// 			$password
-	// 		)
-	// 	);
-	// }
-
 	/**
 	 * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" with headers$/
 	 *
@@ -246,160 +192,7 @@ class OCSContext implements Context {
 			)
 		);
 	}
-
-	// /**
-	//  * @When /^the administrator sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" with headers$/
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param TableNode $headersTable
-	//  *
-	//  * @return void
-	//  * @throws Exception
-	//  */
-	// public function administratorSendsToOcsApiEndpointWithHeaders(
-	// 	string $verb,
-	// 	string $url,
-	// 	TableNode $headersTable
-	// ): void {
-	// 	$user = $this->featureContext->getAdminUsername();
-	// 	$password = $this->featureContext->getPasswordForUser($user);
-	// 	$this->featureContext->setResponse(
-	// 		$this->sendRequestToOcsEndpoint(
-	// 			$user,
-	// 			$verb,
-	// 			$url,
-	// 			null,
-	// 			$password,
-	// 			$headersTable->getRowsHash()
-	// 		)
-	// 	);
-	// }
-
-	// /**
-	//  * @When /^the administrator sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" with headers using password "([^"]*)"$/
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param string $password
-	//  * @param TableNode $headersTable
-	//  *
-	//  * @return void
-	//  * @throws Exception
-	//  */
-	// public function administratorSendsToOcsApiEndpointWithHeadersAndPassword(
-	// 	string $verb,
-	// 	string $url,
-	// 	string $password,
-	// 	TableNode $headersTable
-	// ): void {
-	// 	$this->featureContext->setResponse(
-	// 		$this->sendRequestToOcsEndpoint(
-	// 			$this->featureContext->getAdminUsername(),
-	// 			$verb,
-	// 			$url,
-	// 			null,
-	// 			$password,
-	// 			$headersTable->getRowsHash()
-	// 		)
-	// 	);
-	// }
-
-	// /**
-	//  * @When the administrator sends HTTP method :verb to OCS API endpoint :url with body
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param TableNode|null $body
-	//  *
-	//  * @return void
-	//  */
-	// public function theAdministratorSendsHttpMethodToOcsApiEndpointWithBody(
-	// 	string $verb,
-	// 	string $url,
-	// 	?TableNode $body
-	// ): void {
-	// 	$response = $this->adminSendsHttpMethodToOcsApiEndpointWithBody(
-	// 		$verb,
-	// 		$url,
-	// 		$body
-	// 	);
-	// 	$this->featureContext->setResponse($response);
-	// }
-
-	// /**
-	//  * @When /^the user sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" with body$/
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param TableNode $body
-	//  *
-	//  * @return void
-	//  */
-	// public function theUserSendsHTTPMethodToOcsApiEndpointWithBody(string $verb, string $url, TableNode $body): void {
-	// 	$response = $this->theUserSendsToOcsApiEndpointWithBody(
-	// 		$verb,
-	// 		$url,
-	// 		$body
-	// 	);
-	// 	$this->featureContext->setResponse($response);
-	// }
-
-	// /**
-	//  * @When the administrator sends HTTP method :verb to OCS API endpoint :url with body using password :password
-	//  *
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param string $password
-	//  * @param TableNode $body
-	//  *
-	//  * @return void
-	//  */
-	// public function theAdministratorSendsHttpMethodToOcsApiWithBodyAndPassword(
-	// 	string $verb,
-	// 	string $url,
-	// 	string $password,
-	// 	TableNode $body
-	// ): void {
-	// 	$admin = $this->featureContext->getAdminUsername();
-	// 	$response = $this->sendRequestToOcsEndpoint(
-	// 		$admin,
-	// 		$verb,
-	// 		$url,
-	// 		$body,
-	// 		$password
-	// 	);
-	// 	$this->featureContext->setResponse($response);
-	// }
-
-	// /**
-	//  * @When /^user "([^"]*)" sends HTTP method "([^"]*)" to OCS API endpoint "([^"]*)" with body using password "([^"]*)"$/
-	//  *
-	//  * @param string $user
-	//  * @param string $verb
-	//  * @param string $url
-	//  * @param string $password
-	//  * @param TableNode $body
-	//  *
-	//  * @return void
-	//  */
-	// public function userSendsHTTPMethodToOcsApiEndpointWithBodyAndPassword(
-	// 	string $user,
-	// 	string $verb,
-	// 	string $url,
-	// 	string $password,
-	// 	TableNode $body
-	// ): void {
-	// 	$response = $this->sendRequestToOcsEndpoint(
-	// 		$user,
-	// 		$verb,
-	// 		$url,
-	// 		$body,
-	// 		$password
-	// 	);
-	// 	$this->featureContext->setResponse($response);
-	// }
-
+	
 	/**
 	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 *
@@ -494,64 +287,37 @@ class OCSContext implements Context {
 		);
 	}
 
-	// /**
-	//  * Check the text in an OCS status message
-	//  *
-	//  * @Then /^the OCS status message about user "([^"]*)" should be "([^"]*)"$/
-	//  *
-	//  * @param string $user
-	//  * @param string $statusMessage
-	//  *
-	//  * @return void
-	//  */
-	// public function theOCSStatusMessageAboutUserShouldBe(string $user, string $statusMessage): void {
-	// 	$user = \strtolower($this->featureContext->getActualUsername($user));
-	// 	$statusMessage = $this->featureContext->substituteInLineCodes(
-	// 		$statusMessage,
-	// 		$user
-	// 	);
-	// 	Assert::assertEquals(
-	// 		$statusMessage,
-	// 		$this->getOCSResponseStatusMessage(
-	// 			$this->featureContext->getResponse()
-	// 		),
-	// 		'Unexpected OCS status message :"' . $this->getOCSResponseStatusMessage(
-	// 			$this->featureContext->getResponse()
-	// 		) . '" in response'
-	// 	);
-	// }
-
-	// /**
-	//  * Check the text in an OCS status message.
-	//  * Use this step form if the expected text contains double quotes,
-	//  * single quotes and other content that theOCSStatusMessageShouldBe()
-	//  * cannot handle.
-	//  *
-	//  * After the step, write the expected text in PyString form like:
-	//  *
-	//  * """
-	//  * File "abc.txt" can't be shared due to reason "xyz"
-	//  * """
-	//  *
-	//  * @Then /^the OCS status message should be:$/
-	//  *
-	//  * @param PyStringNode $statusMessage
-	//  *
-	//  * @return void
-	//  */
-	// public function theOCSStatusMessageShouldBePyString(
-	// 	PyStringNode $statusMessage
-	// ): void {
-	// 	Assert::assertEquals(
-	// 		$statusMessage->getRaw(),
-	// 		$this->getOCSResponseStatusMessage(
-	// 			$this->featureContext->getResponse()
-	// 		),
-	// 		'Unexpected OCS status message: "' . $this->getOCSResponseStatusMessage(
-	// 			$this->featureContext->getResponse()
-	// 		) . '" in response'
-	// 	);
-	// }
+	/**
+	 * Check the text in an OCS status message.
+	 * Use this step form if the expected text contains double quotes,
+	 * single quotes and other content that theOCSStatusMessageShouldBe()
+	 * cannot handle.
+	 *
+	 * After the step, write the expected text in PyString form like:
+	 *
+	 * """
+	 * File "abc.txt" can't be shared due to reason "xyz"
+	 * """
+	 *
+	 * @Then /^the OCS status message should be:$/
+	 *
+	 * @param PyStringNode $statusMessage
+	 *
+	 * @return void
+	 */
+	public function theOCSStatusMessageShouldBePyString(
+		PyStringNode $statusMessage
+	): void {
+		Assert::assertEquals(
+			$statusMessage->getRaw(),
+			$this->getOCSResponseStatusMessage(
+				$this->featureContext->getResponse()
+			),
+			'Unexpected OCS status message: "' . $this->getOCSResponseStatusMessage(
+				$this->featureContext->getResponse()
+			) . '" in response'
+		);
+	}
 
 	/**
 	 * Parses the xml answer to get ocs response which doesn't match with
diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile
index 3574286c8..465e6fe98 100644
--- a/tests/acceptance/docker/Makefile
+++ b/tests/acceptance/docker/Makefile
@@ -300,6 +300,4 @@ start-server: ## build and start server
 	OC_ASYNC_UPLOADS=true \
 	SEARCH_EXTRACTOR_TYPE=tika \
 	OC_ADD_RUN_SERVICES=notifications \
-	GRAPH_AVAILABLE_ROLES=$(GRAPH_AVAILABLE_ROLES) \
-	OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST=$(OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST) \
 	docker compose up -d --build --force-recreate
diff --git a/tests/acceptance/docker/src/opencloud-base.yml b/tests/acceptance/docker/src/opencloud-base.yml
index 40ea8779c..1e22da1a6 100644
--- a/tests/acceptance/docker/src/opencloud-base.yml
+++ b/tests/acceptance/docker/src/opencloud-base.yml
@@ -25,8 +25,6 @@ services:
       OC_ADD_RUN_SERVICES: $OC_ADD_RUN_SERVICES
       PROXY_HTTP_ADDR: "0.0.0.0:9200"
       OC_JWT_SECRET: "some-random-jwt-secret"
-      GRAPH_AVAILABLE_ROLES: "${GRAPH_AVAILABLE_ROLES:-b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049}"
-      OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: $OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST
 
       # s3ng specific settings
       STORAGE_USERS_S3NG_ENDPOINT: http://ceph:8080
diff --git a/tests/acceptance/expected-failures-API-on-decomposed-storage.md b/tests/acceptance/expected-failures-API-on-decomposed-storage.md
index 1dea4d7cd..633d717ee 100644
--- a/tests/acceptance/expected-failures-API-on-decomposed-storage.md
+++ b/tests/acceptance/expected-failures-API-on-decomposed-storage.md
@@ -12,20 +12,6 @@ _ocdav: double-check the webdav property parsing when custom namespaces are used
 - [coreApiWebdavProperties/setFileProperties.feature:129](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L129)
 - [coreApiWebdavProperties/setFileProperties.feature:130](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/setFileProperties.feature#L130)
 
-#### [file versions do not report the version author](https://github.com/owncloud/ocis/issues/2914)
-
-- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14)
-- [coreApiVersions/fileVersionAuthor.feature:60](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L60)
-- [coreApiVersions/fileVersionAuthor.feature:92](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L92)
-- [coreApiVersions/fileVersionAuthor.feature:123](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L123)
-- [coreApiVersions/fileVersionAuthor.feature:161](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L161)
-- [coreApiVersions/fileVersionAuthor.feature:193](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L193)
-- [coreApiVersions/fileVersionAuthor.feature:229](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L229)
-- [coreApiVersions/fileVersionAuthor.feature:274](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L274)
-- [coreApiVersions/fileVersionAuthor.feature:356](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L356)
-- [coreApiVersions/fileVersionAuthor.feature:435](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L435)
-- [coreApiVersions/fileVersionAuthor.feature:466](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L466)
-
 ### Sync
 
 Synchronization features like etag propagation, setting mtime and locking files
@@ -40,12 +26,12 @@ Synchronization features like etag propagation, setting mtime and locking files
 
 #### [d:quota-available-bytes in dprop of PROPFIND give wrong response value](https://github.com/owncloud/ocis/issues/8197)
 
-- [coreApiWebdavProperties/getQuota.feature:54](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L54)
-- [coreApiWebdavProperties/getQuota.feature:55](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L55)
-- [coreApiWebdavProperties/getQuota.feature:56](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L56)
-- [coreApiWebdavProperties/getQuota.feature:70](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L70)
-- [coreApiWebdavProperties/getQuota.feature:71](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L71)
-- [coreApiWebdavProperties/getQuota.feature:72](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L72)
+- [coreApiWebdavProperties/getQuota.feature:57](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L57)
+- [coreApiWebdavProperties/getQuota.feature:58](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L58)
+- [coreApiWebdavProperties/getQuota.feature:59](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L59)
+- [coreApiWebdavProperties/getQuota.feature:73](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L73)
+- [coreApiWebdavProperties/getQuota.feature:74](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L74)
+- [coreApiWebdavProperties/getQuota.feature:75](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavProperties/getQuota.feature#L75)
 
 #### [deleting a file inside a received shared folder is moved to the trash-bin of the sharer not the receiver](https://github.com/owncloud/ocis/issues/1124)
 
@@ -162,7 +148,7 @@ _ocdav: api compatibility, return correct status code_
 - [coreApiWebdavMove1/moveFolder.feature:218](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L218)
 - [coreApiWebdavMove1/moveFolder.feature:219](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature#L219)
 - [coreApiWebdavMove2/moveShareOnOpencloud.feature:334](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L334)
-- [coreApiWebdavMove2/moveShareOnOpenCloud.feature:337](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpenCloud.feature#L337)
+- [coreApiWebdavMove2/moveShareOnOpencloud.feature:337](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L337)
 - [coreApiWebdavMove2/moveShareOnOpencloud.feature:340](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOpencloud.feature#L340)
 
 #### [COPY file/folder to same name is possible (but 500 code error for folder with spaces path)](https://github.com/owncloud/ocis/issues/8711)
diff --git a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md
index 845bde6f3..bd4b95b6e 100644
--- a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md
+++ b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md
@@ -30,30 +30,12 @@
 - [apiGraphUserGroup/getUser.feature:84](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L84)
 - [apiGraphUserGroup/getUser.feature:85](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L85)
 - [apiGraphUserGroup/getUser.feature:86](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L86)
-- [apiGraphUserGroup/getUser.feature:87](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L87)
-- [apiGraphUserGroup/getUser.feature:88](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L88)
-- [apiGraphUserGroup/getUser.feature:89](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L89)
-- [apiGraphUserGroup/getUser.feature:90](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L90)
-- [apiGraphUserGroup/getUser.feature:91](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L91)
-- [apiGraphUserGroup/getUser.feature:92](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L92)
-- [apiGraphUserGroup/getUser.feature:93](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L93)
-- [apiGraphUserGroup/getUser.feature:94](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L94)
-- [apiGraphUserGroup/getUser.feature:95](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L95)
-- [apiGraphUserGroup/getUser.feature:637](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L637)
-- [apiGraphUserGroup/getUser.feature:638](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L638)
-- [apiGraphUserGroup/getUser.feature:639](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L639)
-- [apiGraphUserGroup/getUser.feature:640](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L640)
-- [apiGraphUserGroup/getUser.feature:641](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L641)
-- [apiGraphUserGroup/getUser.feature:642](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L642)
-- [apiGraphUserGroup/getUser.feature:643](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L643)
+- [apiGraphUserGroup/getUser.feature:628](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L628)
+- [apiGraphUserGroup/getUser.feature:629](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L629)
+- [apiGraphUserGroup/getUser.feature:630](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L630)
 - [apiGraphUserGroup/getUser.feature:644](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L644)
 - [apiGraphUserGroup/getUser.feature:645](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L645)
 - [apiGraphUserGroup/getUser.feature:646](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L646)
-- [apiGraphUserGroup/getUser.feature:647](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L647)
-- [apiGraphUserGroup/getUser.feature:648](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L648)
-- [apiGraphUserGroup/getUser.feature:663](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L663)
-- [apiGraphUserGroup/getUser.feature:664](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L664)
-- [apiGraphUserGroup/getUser.feature:665](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraphUserGroup/getUser.feature#L665)
 
 #### [Normal user can get expanded members information of a group](https://github.com/owncloud/ocis/issues/5604)
 
@@ -172,59 +154,6 @@
 - [apiLocks/lockFiles.feature:556](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiLocks/lockFiles.feature#L556)
 - [apiLocks/lockFiles.feature:557](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiLocks/lockFiles.feature#L557)
 
-#### [blocksDownload link type is not implemented yet (sharing-ng)](https://github.com/owncloud/ocis/issues/7879)
-
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:72](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L72)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:202](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L202)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:340](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L340)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:409](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L409)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:475](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L475)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:617](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L617)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:763](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L763)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:819](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L819)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:820](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L820)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:821](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L821)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:891](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L891)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:957](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L957)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1101](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1101)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1170](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1170)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1220](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1220)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1221](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1221)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1222](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1222)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1374](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1374)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1632](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1632)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1686](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1686)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1687](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1687)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1688](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1688)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1756](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1756)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1822](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1822)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1944](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1944)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:2071](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L2071)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:2198](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L2198)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:2326](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L2326)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:73](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L73)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:75](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L75)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:76](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L76)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:77](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L77)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:143](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L143)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:405](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L405)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:792](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L792)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:212](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L212)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:352](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L352)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:406](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L406)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:407](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L407)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:408](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L408)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:476](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L476)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:543](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L543)
-- [apiSharingNgLinkShareRoot/createLinkShare.feature:614](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature#L614)
-- [apiSharingNg2/removeAccessToDriveItemInLinkShare.feature:27](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature#L27)
-- [apiSharingNg2/removeAccessToDriveItemInLinkShare.feature:43](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature#L43)
-- [apiSharingNg2/removeAccessToDriveItemInLinkShare.feature:63](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature#L63)
-- [apiSharingNg2/removeAccessToDriveItemInLinkShare.feature:81](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature#L81)
-- [apiSharingNg1/removeAccessToDrive.feature:177](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature#L177)
-- [apiSharingNg1/removeAccessToDrive.feature:206](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature#L206)
-- [apiSharingNg1/removeAccessToDrive.feature:236](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature#L236)
-
 #### [sharee (editor role) MOVE a file by file-id into shared sub-folder returns 502](https://github.com/owncloud/ocis/issues/7617)
 
 - [apiSpacesDavOperation/moveByFileId.feature:368](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSpacesDavOperation/moveByFileId.feature#L368)
diff --git a/tests/acceptance/expected-failures-without-remotephp.md b/tests/acceptance/expected-failures-without-remotephp.md
index 4403c3991..95d9982eb 100644
--- a/tests/acceptance/expected-failures-without-remotephp.md
+++ b/tests/acceptance/expected-failures-without-remotephp.md
@@ -157,10 +157,10 @@
 - [apiSpacesShares/shareSpacesViaLink.feature:44](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature#L44)
 - [apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature:146](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature#L146)
 - [apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature:147](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature#L147)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:478](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L478)
-- [apiSharingNgLinkSharePermission/createLinkShare.feature:1225](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1225)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:209](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L209)
-- [apiSharingNgLinkSharePermission/updateLinkShare.feature:287](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L287)
+- [apiSharingNgLinkSharePermission/createLinkShare.feature:473](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L473)
+- [apiSharingNgLinkSharePermission/createLinkShare.feature:1208](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature#L1208)
+- [apiSharingNgLinkSharePermission/updateLinkShare.feature:203](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L203)
+- [apiSharingNgLinkSharePermission/updateLinkShare.feature:282](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature#L282)
 - [apiSharingNgLinkShareRoot/updateLinkShare.feature:10](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/updateLinkShare.feature#L10)
 - [apiSharingNgLinkShareRoot/updateLinkShare.feature:42](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSharingNgLinkShareRoot/updateLinkShare.feature#L42)
 - [coreApiSharePublicLink1/changingPublicLinkShare.feature:219](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature#L219)
diff --git a/tests/acceptance/features/apiGraphUserGroup/getUser.feature b/tests/acceptance/features/apiGraphUserGroup/getUser.feature
index ee77f6040..92d4066a0 100644
--- a/tests/acceptance/features/apiGraphUserGroup/getUser.feature
+++ b/tests/acceptance/features/apiGraphUserGroup/getUser.feature
@@ -81,17 +81,8 @@ Feature: get users
       """
     Examples:
       | user-role   | user-role-2 |
-      | Space Admin | Space Admin |
-      | Space Admin | User        |
       | Space Admin | User Light  |
-      | Space Admin | Admin       |
       | User        | Space Admin |
-      | User        | User        |
-      | User        | User Light  |
-      | User        | Admin       |
-      | User Light  | Space Admin |
-      | User Light  | User        |
-      | User Light  | User Light  |
       | User Light  | Admin       |
 
 
@@ -634,17 +625,8 @@ Feature: get users
       """
     Examples:
       | user-role   | user-role-2 |
-      | Space Admin | Space Admin |
       | Space Admin | User        |
-      | Space Admin | User Light  |
-      | Space Admin | Admin       |
       | User        | Space Admin |
-      | User        | User        |
-      | User        | User Light  |
-      | User        | Admin       |
-      | User Light  | Space Admin |
-      | User Light  | User        |
-      | User Light  | User Light  |
       | User Light  | Admin       |
 
 
diff --git a/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature b/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature
index 5438eca96..267020f6b 100644
--- a/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature
+++ b/tests/acceptance/features/apiSharingNg1/removeAccessToDrive.feature
@@ -174,7 +174,6 @@ Feature: Remove access to a drive
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: user removes internal link share from project space using root endpoint
@@ -203,7 +202,6 @@ Feature: Remove access to a drive
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: user tries to remove internal link share of project space owned by next user using root endpoint
@@ -233,7 +231,6 @@ Feature: Remove access to a drive
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: user removes internal link share of a project drive using permissions endpoint
diff --git a/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature b/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature
index ca3dd41c1..0605fd299 100644
--- a/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature
+++ b/tests/acceptance/features/apiSharingNg2/removeAccessToDriveItemInLinkShare.feature
@@ -24,7 +24,6 @@ Feature: Remove access to a drive item
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario Outline: user removes access to a file in link share
@@ -40,7 +39,6 @@ Feature: Remove access to a drive item
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
 
   Scenario Outline: user removes access to a folder in project space in link share
@@ -60,7 +58,6 @@ Feature: Remove access to a drive item
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario Outline: user removes access to a file in project space in link share
@@ -78,4 +75,3 @@ Feature: Remove access to a drive item
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
diff --git a/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature b/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature
index 849979fbf..4c7a5440c 100644
--- a/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature
+++ b/tests/acceptance/features/apiSharingNgLinkSharePermission/createLinkShare.feature
@@ -69,7 +69,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
   @issue-8619
   Scenario: create an internal link share of a folder using permissions endpoint
@@ -199,7 +198,6 @@ Feature: Create a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
   @issue-8619
   Scenario: create an internal link share of a file using permissions endpoint
@@ -337,7 +335,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
   @issue-7879
   Scenario Outline: create a link share of a file with display name and expiry date using permissions endpoint
@@ -406,7 +403,6 @@ Feature: Create a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
   @env-config @issue-7879
   Scenario Outline: create a link share of a file without password using permissions endpoint
@@ -472,7 +468,6 @@ Feature: Create a link share for a resource
       | view             |
       | edit             |
       | internal         |
-      | blocksDownload   |
 
   @env-config @issue-9724 @issue-10331
   Scenario: set password on a file's link share using permissions endpoint
@@ -505,7 +500,7 @@ Feature: Create a link share for a resource
       """
     And the public should be able to download file "textfile1.txt" from the last link share with password "%public%" and the content should be "other data"
 
-
+  @skip-local-run
   Scenario Outline: create a file's link share with a password that is listed in the Banned-Password-List using permissions endpoint
     Given the config "OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST" has been set to path "config/drone/banned-password-list.txt"
     And user "Alice" has uploaded file with content "other data" to "text.txt"
@@ -614,7 +609,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: create an internal link share of a folder inside project-space using permissions endpoint
@@ -760,9 +754,8 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
-
 
+  @skip-local-run
   Scenario Outline: create a link share of a folder inside project-space with a password that is listed in the Banned-Password-List using permissions endpoint
     Given the config "OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST" has been set to path "config/drone/banned-password-list.txt"
     And using spaces DAV path
@@ -816,9 +809,6 @@ Feature: Create a link share for a resource
       | 123             | createOnly       |
       | password        | createOnly       |
       | OpenCloud        | createOnly       |
-      | 123             | blocksDownload   |
-      | password        | blocksDownload   |
-      | OpenCloud        | blocksDownload   |
 
   @env-config @issue-7879
   Scenario Outline: create a link share of a file inside project-space without password using permissions endpoint
@@ -888,7 +878,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
   @issue-7879
   Scenario Outline: create a link share of a file inside project-space using permissions endpoint
@@ -954,7 +943,6 @@ Feature: Create a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
   @issue-8619
   Scenario: create an internal link share of a file inside project-space using permissions endpoint
@@ -1098,7 +1086,6 @@ Feature: Create a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
   @env-config @issue-7879
   Scenario Outline: create a link share of a file inside project-space without password using permissions endpoint
@@ -1167,9 +1154,8 @@ Feature: Create a link share for a resource
       | view             |
       | edit             |
       | internal         |
-      | blocksDownload   |
-
 
+  @skip-local-run
   Scenario Outline: create a link share of a file inside project-space with a password that is listed in the Banned-Password-List using permissions endpoint
     Given the config "OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST" has been set to path "config/drone/banned-password-list.txt"
     And using spaces DAV path
@@ -1217,9 +1203,6 @@ Feature: Create a link share for a resource
       | 123             | edit             |
       | password        | edit             |
       | OpenCloud        | edit             |
-      | 123             | blocksDownload   |
-      | password        | blocksDownload   |
-      | OpenCloud        | blocksDownload   |
 
   @env-config @issue-9724 @issue-10331
   Scenario: set password on a existing link share of a file inside project-space using permissions endpoint
@@ -1300,12 +1283,10 @@ Feature: Create a link share for a resource
       | edit             | Shares   | no share permission                       |
       | upload           | Shares   | no share permission                       |
       | createOnly       | Shares   | no share permission                       |
-      | blocksDownload   | Shares   | invalid link type                         |
       | view             | Personal | cannot create link on personal space root |
       | edit             | Personal | cannot create link on personal space root |
       | upload           | Personal | cannot create link on personal space root |
       | createOnly       | Personal | cannot create link on personal space root |
-      | blocksDownload   | Personal | invalid link type                         |
 
   @issue-7879
   Scenario Outline: create a link share of a project-space drive using permissions endpoint
@@ -1371,7 +1352,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario Outline: try to create an internal link share of a Personal and Shares drives using permissions endpoint
@@ -1629,9 +1609,8 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
-
 
+  @skip-local-run
   Scenario Outline: try to create a link share of a project-space with a password that is listed in the Banned-Password-List using permissions endpoint
     Given the config "OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST" has been set to path "config/drone/banned-password-list.txt"
     And using spaces DAV path
@@ -1683,9 +1662,6 @@ Feature: Create a link share for a resource
       | 123             | createOnly       |
       | password        | createOnly       |
       | OpenCloud        | createOnly       |
-      | 123             | blocksDownload   |
-      | password        | blocksDownload   |
-      | OpenCloud        | blocksDownload   |
 
 
   Scenario Outline: create a link share of a project-space without password using permissions endpoint
@@ -1753,7 +1729,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario Outline: create a quick link share of a folder using permissions endpoint
@@ -1819,7 +1794,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: create an internal quick link share of a folder using permissions endpoint
@@ -1941,7 +1915,6 @@ Feature: Create a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
 
   Scenario: create an internal quick link share of a file using permissions endpoint
@@ -2068,7 +2041,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: create an internal quick link share of a folder inside project-space using permissions endpoint
@@ -2195,7 +2167,6 @@ Feature: Create a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
   @issue-8619
   Scenario: create an internal quick link share of a file inside project-space using permissions endpoint
@@ -2323,7 +2294,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: create an internal quick link share of a project-space using permissions endpoint
diff --git a/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature b/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature
index 40d5f3403..b7b6aef86 100644
--- a/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature
+++ b/tests/acceptance/features/apiSharingNgLinkSharePermission/updateLinkShare.feature
@@ -70,11 +70,7 @@ Feature: Update a link share for a resource
     Examples:
       | permissions-role | new-permissions-role |
       | view             | edit                 |
-      | view             | blocksDownload       |
       | edit             | view                 |
-      | edit             | blocksDownload       |
-      | blocksDownload   | edit                 |
-      | blocksDownload   | blocksDownload       |
 
   @issue-8619
   Scenario Outline: update role of a file's to internal link share using permissions endpoint
@@ -140,7 +136,6 @@ Feature: Update a link share for a resource
       | permissions-role |
       | view             |
       | edit             |
-      | blocksDownload   |
 
 
   Scenario: update expiration date of a file's link share using permissions endpoint
@@ -235,7 +230,7 @@ Feature: Update a link share for a resource
     And the public should be able to download file "textfile1.txt" from the last link share with password "%public%" and the content should be "other data"
     And the public download of file "textfile1.txt" from the last link share with password "$heLlo*1234*" should fail with HTTP status code "401" using shareNg
 
-
+  @skip-local-run
   Scenario Outline: update a file's link share with a password that is listed in the Banned-Password-List using permissions endpoint
     Given the config "OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST" has been set to path "config/drone/banned-password-list.txt"
     And user "Alice" has uploaded file with content "other data" to "text.txt"
@@ -402,7 +397,6 @@ Feature: Update a link share for a resource
       | createOnly       | view                 |
       | createOnly       | edit                 |
       | createOnly       | upload               |
-      | blocksDownload   | blocksDownload       |
 
 
   Scenario Outline: update role of a folder's link share inside project-space using permissions endpoint
@@ -789,7 +783,6 @@ Feature: Update a link share for a resource
       | createOnly       | view                 |
       | createOnly       | edit                 |
       | createOnly       | upload               |
-      | blocksDownload   | blocksDownload       |
 
   @issues-8405
   Scenario Outline: remove expiration date of a resource link share using permissions endpoint
diff --git a/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature b/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature
index 6e1f81937..256833857 100644
--- a/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature
+++ b/tests/acceptance/features/apiSharingNgLinkShareRoot/createLinkShare.feature
@@ -51,12 +51,10 @@ Feature: Create a link share for a resource
       | edit             | Shares   |
       | upload           | Shares   |
       | createOnly       | Shares   |
-      | blocksDownload   | Shares   |
       | view             | Personal |
       | edit             | Personal |
       | upload           | Personal |
       | createOnly       | Personal |
-      | blocksDownload   | Personal |
 
 
   Scenario Outline: try to create an internal link share of a Personal and Share drives using root endpoint
@@ -209,7 +207,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario: create an internal link share of a project-space using root endpoint
@@ -349,9 +346,8 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
-  @issue-7879
+  @issue-7879 @skip-local-run
   Scenario Outline: try to create a link share of a project-space drive with a password that is listed in the Banned-Password-List using root endpoint
     Given the config "OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST" has been set to path "config/drone/banned-password-list.txt"
     And using spaces DAV path
@@ -403,9 +399,6 @@ Feature: Create a link share for a resource
       | 123             | createOnly       |
       | password        | createOnly       |
       | OpenCloud        | createOnly       |
-      | 123             | blocksDownload   |
-      | password        | blocksDownload   |
-      | OpenCloud        | blocksDownload   |
 
   @env-config @issue-7879
   Scenario Outline: create a link share of a project-space drive without password using root endpoint
@@ -473,7 +466,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
   @issue-7879
   Scenario Outline: create a link share of a project-space drive with display name using root endpoint
@@ -540,7 +532,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
   @issue-7879
   Scenario Outline: create a link share of a project-space drive with expiry date using root endpoint
@@ -611,7 +602,6 @@ Feature: Create a link share for a resource
       | edit             |
       | upload           |
       | createOnly       |
-      | blocksDownload   |
 
 
   Scenario Outline: create quick link share of a project space drive using root endpoint
diff --git a/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature b/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature
deleted file mode 100644
index 3838d3447..000000000
--- a/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature
+++ /dev/null
@@ -1,493 +0,0 @@
-@issue-2914 @skipOnReva
-Feature: file versions remember the author of each version
-  As a user
-  I want to know the author of each version of a file
-  So that I can better understand the version history and choose a version to restore
-
-  Background:
-    Given using OCS API version "2"
-    And user "Alice" has been created with default attributes
-    And user "Brian" has been created with default attributes
-    And user "Carol" has been created with default attributes
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users
-    Given user "David" has been created with default attributes
-    And user "Alice" has created folder "/test"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Brian    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Carol    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Carol" has a share "test" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | David    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "David" has a share "test" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/test/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/test/textfile0.txt"
-    And user "David" has uploaded file with content "uploaded content david" to "/Shares/test/textfile0.txt"
-    When user "Alice" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "3"
-    And the content of version index "1" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content carol"
-    And the content of version index "2" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "3" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    And as users "Brian,Carol,David" the authors of the versions of file "/Shares/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users for shared folder in the group
-    Given user "Alice" has created folder "/test"
-    And group "grp1" has been created
-    And user "Alice" has been added to group "grp1"
-    And user "Brian" has been added to group "grp1"
-    And user "Carol" has been added to group "grp1"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | grp1     |
-      | shareType       | group    |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Carol" has a share "test" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/test/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/test/textfile0.txt"
-    When user "Alice" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "2"
-    And the content of version index "1" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "2" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-    And as users "Brian,Carol" the authors of the versions of file "/Shares/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users for shared file in the group
-    Given group "grp1" has been created
-    And user "Alice" has been added to group "grp1"
-    And user "Brian" has been added to group "grp1"
-    And user "Carol" has been added to group "grp1"
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/textfile0.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | grp1          |
-      | shareType       | group         |
-      | permissionsRole | File Editor   |
-    And user "Brian" has a share "textfile0.txt" synced
-    And user "Carol" has a share "textfile0.txt" synced
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/textfile0.txt"
-    When user "Alice" gets the number of versions of file "textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "2"
-    And the content of version index "1" of file "/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "2" of file "/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-    And as users "Brian,Carol" the authors of the versions of file "/Shares/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users while moving file in/out of a subfolder
-    Given user "Alice" has created folder "/test"
-    And group "grp1" has been created
-    And user "Alice" has been added to group "grp1"
-    And user "Brian" has been added to group "grp1"
-    And user "Carol" has been added to group "grp1"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | grp1     |
-      | shareType       | group    |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Carol" has a share "test" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/test/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/test/textfile0.txt"
-    And user "Alice" has moved file "/test/textfile0.txt" to "/textfile0.txt"
-    And user "Alice" has uploaded file with content "uploaded content alice after moving file outside subfolder" to "/textfile0.txt"
-    And user "Alice" has moved file "/textfile0.txt" to "/test/textfile0.txt"
-    When user "Alice" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "3"
-    And the content of version index "1" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content carol"
-    And the content of version index "2" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "3" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    And as users "Brian,Carol" the authors of the versions of file "/Shares/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users after renaming file by sharer
-    Given group "grp1" has been created
-    And user "Alice" has been added to group "grp1"
-    And user "Brian" has been added to group "grp1"
-    And user "Carol" has been added to group "grp1"
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/exist.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | exist.txt   |
-      | space           | Personal    |
-      | sharee          | grp1        |
-      | shareType       | group       |
-      | permissionsRole | File Editor |
-    And user "Brian" has a share "exist.txt" synced
-    And user "Carol" has a share "exist.txt" synced
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/exist.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/exist.txt"
-    And user "Alice" has moved file "/exist.txt" to "/textfile0.txt"
-    When user "Alice" gets the number of versions of file "textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "2"
-    And the content of version index "1" of file "/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "2" of file "/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as user "Alice" the authors of the versions of file "/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-    And as users "Brian,Carol" the authors of the versions of file "/Shares/exist.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-
-  @issue-7555
-  Scenario: enable file versioning and check the history of changes in sharer after renaming file by sharee
-    Given group "grp1" has been created
-    And user "Alice" has been added to group "grp1"
-    And user "Brian" has been added to group "grp1"
-    And user "Carol" has been added to group "grp1"
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/exist.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | exist.txt   |
-      | space           | Personal    |
-      | sharee          | grp1        |
-      | shareType       | group       |
-      | permissionsRole | File Editor |
-    And user "Brian" has a share "exist.txt" synced
-    And user "Carol" has a share "exist.txt" synced
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/exist.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/exist.txt"
-    And user "Brian" has moved file "/Shares/exist.txt" to "/Shares/textfile0.txt"
-    When user "Alice" gets the number of versions of file "exist.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "2"
-    And the content of version index "1" of file "/exist.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "2" of file "/exist.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/exist.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-    And as users "Carol" the authors of the versions of file "/Shares/exist.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-    And as user "Brian" the authors of the versions of file "/Shares/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-      | 2     | Alice  |
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users when reshared after unshared by sharer
-    Given user "Alice" has created folder "/test"
-    And group "grp1" has been created
-    And user "Alice" has been added to group "grp1"
-    And user "Brian" has been added to group "grp1"
-    And user "Carol" has been added to group "grp1"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | grp1     |
-      | shareType       | group    |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Carol" has a share "test" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/test/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/test/textfile0.txt"
-    And user "Alice" has deleted the last share
-    And user "Alice" has uploaded file with content "uploaded content alice after unshared folder" to "/test/textfile0.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | grp1     |
-      | shareType       | group    |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Carol" has a share "test" synced
-    When user "Alice" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "3"
-    And the content of version index "1" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content carol"
-    And the content of version index "2" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "3" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    And as users "Brian,Carol" the authors of the versions of file "/Shares/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users who have a matching folder/file
-    Given user "David" has been created with default attributes
-    And user "Brian" has created folder "/test"
-    And user "Brian" has uploaded file with content "duplicate brian" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "overwrite brian" to "/test/textfile0.txt"
-    And user "Brian" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Carol    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Carol" has a share "test" synced
-    And user "Brian" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | David    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "David" has a share "test" synced
-    And user "Carol" has created folder "/test"
-    And user "Carol" has uploaded file with content "duplicate carol" to "/test/textfile0.txt"
-    And user "Carol" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Brian    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Alice" has created folder "/test"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Brian    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test (1)" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Carol    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Carol" has a share "test (1)" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | David    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "David" has a share "test (1)" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/test (1)/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/test (1)/textfile0.txt"
-    And user "David" has uploaded file with content "uploaded content david" to "/Shares/test (1)/textfile0.txt"
-    When user "Alice" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "3"
-    And the content of version index "1" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content carol"
-    And the content of version index "2" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "3" of file "/test/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    And as users "Brian,Carol,David" the authors of the versions of file "/Shares/test (1)/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    When user "Brian" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "1"
-    And the content of version index "1" of file "/test/textfile0.txt" for user "Brian" should be "duplicate brian"
-    And as user "Brian" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-    When user "Carol" gets the number of versions of file "/test/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "0"
-
-
-  Scenario: enable file versioning and check the history of changes from multiple users who have a matching file
-    Given user "David" has been created with default attributes
-    And user "Brian" has uploaded file with content "duplicate brian" to "/textfile0.txt"
-    And user "Brian" has uploaded file with content "overwrite brian" to "/textfile0.txt"
-    And user "Brian" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | Carol         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "Carol" has a share "textfile0.txt" synced
-    And user "Brian" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | David         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "David" has a share "textfile0.txt" synced
-    And user "Carol" has uploaded file with content "duplicate carol" to "/textfile0.txt"
-    And user "Carol" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "Brian" has a share "textfile0.txt" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/textfile0.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "Brian" has a share "textfile0 (1).txt" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | Carol         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "Carol" has a share "textfile0 (1).txt" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | David         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "David" has a share "textfile0 (1).txt" synced
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/textfile0 (1).txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/textfile0 (1).txt"
-    And user "David" has uploaded file with content "uploaded content david" to "/Shares/textfile0 (1).txt"
-    When user "Alice" gets the number of versions of file "/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "3"
-    And the content of version index "1" of file "/textfile0.txt" for user "Alice" should be "uploaded content carol"
-    And the content of version index "2" of file "/textfile0.txt" for user "Alice" should be "uploaded content brian"
-    And the content of version index "3" of file "/textfile0.txt" for user "Alice" should be "uploaded content alice"
-    And as users "Alice" the authors of the versions of file "/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    And as users "Brian,Carol,David" the authors of the versions of file "/Shares/textfile0 (1).txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Brian  |
-      | 3     | Alice  |
-    When user "Brian" gets the number of versions of file "/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "1"
-    And the content of version index "1" of file "/textfile0.txt" for user "Brian" should be "duplicate brian"
-    And as user "Brian" the authors of the versions of file "/textfile0.txt" should be:
-      | index | author |
-      | 1     | Brian  |
-    When user "Carol" gets the number of versions of file "/textfile0.txt"
-    Then the HTTP status code should be "207"
-    And the number of versions should be "0"
-
-
-  Scenario: enable file versioning and check the version author after restoring a version of a file inside a folder
-    Given user "Alice" has created folder "/test"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Brian    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Brian" has a share "test" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | test     |
-      | space           | Personal |
-      | sharee          | Carol    |
-      | shareType       | user     |
-      | permissionsRole | Editor   |
-    And user "Carol" has a share "test" synced
-    And user "Alice" has uploaded file with content "uploaded content alice" to "/test/textfile0.txt"
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/test/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/test/textfile0.txt"
-    When user "Brian" restores version index "1" of file "/Shares/test/textfile0.txt" using the WebDAV API
-    Then the HTTP status code should be "204"
-    And as user "Alice" the authors of the versions of file "/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Alice  |
-    And as user "Brian,Carol" the authors of the versions of file "/Shares/test/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Alice  |
-
-
-  Scenario: enable file versioning and check the version author after restoring a version of a file
-    Given user "Alice" has uploaded file with content "uploaded content alice" to "/textfile0.txt"
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | Brian         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "Brian" has a share "textfile0.txt" synced
-    And user "Alice" has sent the following resource share invitation:
-      | resource        | textfile0.txt |
-      | space           | Personal      |
-      | sharee          | Carol         |
-      | shareType       | user          |
-      | permissionsRole | File Editor   |
-    And user "Carol" has a share "textfile0.txt" synced
-    And user "Brian" has uploaded file with content "uploaded content brian" to "/Shares/textfile0.txt"
-    And user "Carol" has uploaded file with content "uploaded content carol" to "/Shares/textfile0.txt"
-    When user "Brian" restores version index "1" of file "/Shares/textfile0.txt" using the WebDAV API
-    Then the HTTP status code should be "204"
-    And as user "Alice" the authors of the versions of file "/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Alice  |
-    And as user "Brian,Carol" the authors of the versions of file "/Shares/textfile0.txt" should be:
-      | index | author |
-      | 1     | Carol  |
-      | 2     | Alice  |
diff --git a/tests/acceptance/fixtures/unicode-fixture.png b/tests/acceptance/fixtures/unicode-fixture.png
index 768f1b6a7..04837c22b 100644
Binary files a/tests/acceptance/fixtures/unicode-fixture.png and b/tests/acceptance/fixtures/unicode-fixture.png differ
diff --git a/tests/acceptance/run_api_tests.sh b/tests/acceptance/run_api_tests.sh
index 10b0c2f62..96354d08d 100755
--- a/tests/acceptance/run_api_tests.sh
+++ b/tests/acceptance/run_api_tests.sh
@@ -35,7 +35,6 @@ fi
 # List of suites to run
 SUITES=(
     "apiArchiver"
-    "coreApiAuth"
     "apiContract"
     "apiCors"
     "apiAsyncUpload"
diff --git a/tests/acceptance/run_e2e_tests.sh b/tests/acceptance/run_e2e_tests.sh
index 68edb1bc8..fd81fca9c 100755
--- a/tests/acceptance/run_e2e_tests.sh
+++ b/tests/acceptance/run_e2e_tests.sh
@@ -3,8 +3,6 @@
 # Set required environment variables
 export LOCAL_TEST=true
 export WITH_WRAPPER=false
-export GRAPH_AVAILABLE_ROLES="b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6,63e64e19-8d43-42ec-a738-2b6af2610efa"
-export OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST="/drone/src/tests/config/drone/banned-password-list.txt"
 
 TEST_SERVER_URL="https://opencloud-server:9200"