Check users on correct endpoint

Signed-off-by: Joas Schilling <coding@schilljs.com>

23 files changed, 553 insertions, 543 deletions

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index c3385d9f2..0620d454a 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -243,6 +243,13 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	private function assertRooms($rooms, TableNode $formData) {
 		Assert::assertCount(count($formData->getHash()), $rooms, 'Room count does not match');
 		Assert::assertEquals($formData->getHash(), array_map(function ($room, $expectedRoom) {
+			if (!isset(self::$identifierToToken[$room['name']])) {
+				self::$identifierToToken[$room['name']] = $room['token'];
+			}
+			if (!isset(self::$tokenToIdentifier[$room['token']])) {
+				self::$tokenToIdentifier[$room['token']] = $room['name'];
+			}
+
 			$data = [];
 			if (isset($expectedRoom['id'])) {
 				$data['id'] = self::$tokenToIdentifier[$room['token']];
@@ -289,7 +296,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" (is|is not) participant of room "([^"]*)"(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" (is|is not) participant of room "([^"]*)" \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $isOrNotParticipant
@@ -297,7 +304,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	 * @param string $apiVersion
 	 * @param TableNode|null $formData
 	 */
-	public function userIsParticipantOfRoom($user, $isOrNotParticipant, $identifier, $apiVersion = 'v1', TableNode $formData = null) {
+	public function userIsParticipantOfRoom(string $user, string $isOrNotParticipant, string $identifier, string $apiVersion, TableNode $formData = null) {
 		if (strpos($user, 'guest') === 0) {
 			$this->guestIsParticipantOfRoom($user, $isOrNotParticipant, $identifier, $apiVersion, $formData);
 
@@ -432,7 +439,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	 * @param string $apiVersion
 	 * @param TableNode|null $formData
 	 */
-	private function guestIsParticipantOfRoom($guest, $isOrNotParticipant, $identifier, $apiVersion = 'v1', TableNode $formData = null) {
+	private function guestIsParticipantOfRoom(string $guest, string $isOrNotParticipant, string $identifier, string $apiVersion, TableNode $formData = null) {
 		$this->setCurrentUser($guest);
 		$this->sendRequest('GET', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier]);
 
diff --git a/tests/integration/features/callapi/group-read-only.feature b/tests/integration/features/callapi/group-read-only.feature
index 1889d6452..71619d8b5 100644
--- a/tests/integration/features/callapi/group-read-only.feature
+++ b/tests/integration/features/callapi/group-read-only.feature
@@ -10,8 +10,8 @@ Feature: callapi/group-read-only
     When user "participant1" creates room "room" (v4)
       | roomType | 2 |
       | invite   | attendees1 |
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
     When user "participant1" locks room "room" with 200
diff --git a/tests/integration/features/callapi/group.feature b/tests/integration/features/callapi/group.feature
index 5fd304c3f..3f67e4769 100644
--- a/tests/integration/features/callapi/group.feature
+++ b/tests/integration/features/callapi/group.feature
@@ -15,8 +15,8 @@ Feature: callapi/group
     When user "participant1" creates room "room" (v4)
       | roomType | 2 |
       | invite   | attendees1 |
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
     Then user "participant1" joins room "room" with 200
@@ -55,8 +55,8 @@ Feature: callapi/group
     When user "participant1" creates room "room" (v4)
       | roomType | 2 |
       | invite   | attendees1 |
-    Then user "participant1" is participant of room "room"
-    Then user "participant3" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    Then user "participant3" is not participant of room "room" (v4)
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -84,7 +84,7 @@ Feature: callapi/group
     When user "participant1" creates room "room" (v4)
       | roomType | 2 |
       | invite   | attendees1 |
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" joins call "room" with 200
diff --git a/tests/integration/features/callapi/one-to-one.feature b/tests/integration/features/callapi/one-to-one.feature
index 877e65a88..67db7df64 100644
--- a/tests/integration/features/callapi/one-to-one.feature
+++ b/tests/integration/features/callapi/one-to-one.feature
@@ -13,8 +13,8 @@ Feature: callapi/one-to-one
     When user "participant1" creates room "room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
     Then user "participant1" joins room "room" with 200
@@ -46,8 +46,8 @@ Feature: callapi/one-to-one
     When user "participant1" creates room "room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    Then user "participant1" is participant of room "room"
-    Then user "participant3" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    Then user "participant3" is not participant of room "room" (v4)
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -78,7 +78,7 @@ Feature: callapi/one-to-one
     When user "participant1" creates room "room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -109,16 +109,16 @@ Feature: callapi/one-to-one
     Given user "participant1" creates room "room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant1" removes themselves from room "room" with 200
-    Then user "participant1" is not participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
     When user "participant2" joins room "room" with 200
-    Then user "participant1" is not participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 404
     And user "participant2" sees 0 peers in call "room" with 200
     When user "participant2" joins call "room" with 200
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     And user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
 
diff --git a/tests/integration/features/callapi/password.feature b/tests/integration/features/callapi/password.feature
index 2f3de3904..95f844242 100644
--- a/tests/integration/features/callapi/password.feature
+++ b/tests/integration/features/callapi/password.feature
@@ -15,8 +15,8 @@ Feature: callapi/public
       | roomName | room |
     And user "participant1" sets password "foobar" for room "room" with 200
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
     Then user "participant1" joins room "room" with 200
@@ -44,8 +44,8 @@ Feature: callapi/public
       | roomName | room |
     And user "participant1" sets password "foobar" for room "room" with 200
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    Then user "participant3" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    Then user "participant3" is not participant of room "room" (v4)
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -78,8 +78,8 @@ Feature: callapi/public
       | roomName | room |
     And user "participant1" sets password "foobar" for room "room" with 200
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    Then user "participant3" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    Then user "participant3" is not participant of room "room" (v4)
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -113,7 +113,7 @@ Feature: callapi/public
       | roomName | room |
     And user "participant1" sets password "foobar" for room "room" with 200
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -140,7 +140,7 @@ Feature: callapi/public
       | roomName | room |
     And user "participant1" sets password "foobar" for room "room" with 200
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
diff --git a/tests/integration/features/callapi/public-read-only.feature b/tests/integration/features/callapi/public-read-only.feature
index 63802d6c7..6ef019223 100644
--- a/tests/integration/features/callapi/public-read-only.feature
+++ b/tests/integration/features/callapi/public-read-only.feature
@@ -9,8 +9,8 @@ Feature: callapi/public-read-only
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
     When user "participant1" locks room "room" with 200
@@ -31,8 +31,8 @@ Feature: callapi/public-read-only
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    Then user "participant3" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    Then user "participant3" is not participant of room "room" (v4)
     When user "participant1" locks room "room" with 200
     And user "participant1" joins room "room" with 200
     And user "participant1" joins call "room" with 403
@@ -51,7 +51,7 @@ Feature: callapi/public-read-only
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     When user "participant1" locks room "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
diff --git a/tests/integration/features/callapi/public.feature b/tests/integration/features/callapi/public.feature
index 4a51201c8..87746a48b 100644
--- a/tests/integration/features/callapi/public.feature
+++ b/tests/integration/features/callapi/public.feature
@@ -14,8 +14,8 @@ Feature: callapi/public
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
     Then user "participant1" joins room "room" with 200
@@ -48,8 +48,8 @@ Feature: callapi/public
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
-    Then user "participant3" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    Then user "participant3" is not participant of room "room" (v4)
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
@@ -81,7 +81,7 @@ Feature: callapi/public
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" joins room "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
diff --git a/tests/integration/features/chat/mentions.feature b/tests/integration/features/chat/mentions.feature
index 7208349b9..2d819f6e9 100644
--- a/tests/integration/features/chat/mentions.feature
+++ b/tests/integration/features/chat/mentions.feature
@@ -257,8 +257,8 @@ Feature: chat/mentions
     And user "participant2" accepts last share
     When user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant1" joins room "file welcome.txt room" with 200
-    And user "participant1" is participant of room "file welcome.txt room"
-    And user "participant2" is not participant of room "file welcome.txt room"
+    And user "participant1" is participant of room "file welcome.txt room" (v4)
+    And user "participant2" is not participant of room "file welcome.txt room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file welcome.txt room" for "" with 200
       | id           | label                    | source |
       | all          | welcome.txt              | calls  |
@@ -271,8 +271,8 @@ Feature: chat/mentions
     When user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" joins room "file welcome (2).txt room" with 200
     And user "participant2" joins room "file welcome (2).txt room" with 200
-    And user "participant1" is participant of room "file welcome (2).txt room"
-    And user "participant2" is participant of room "file welcome (2).txt room"
+    And user "participant1" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file welcome (2).txt room" for "" with 200
       | id           | label                    | source |
       | all          | welcome.txt              | calls  |
@@ -288,8 +288,8 @@ Feature: chat/mentions
     When user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" joins room "file welcome (2).txt room" with 200
     And user "participant2" joins room "file welcome (2).txt room" with 200
-    And user "participant1" is participant of room "file welcome (2).txt room"
-    And user "participant2" is participant of room "file welcome (2).txt room"
+    And user "participant1" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file welcome (2).txt room" for "part" with 200
       | id           | label                    | source |
       | participant2 | participant2-displayname | users  |
@@ -303,8 +303,8 @@ Feature: chat/mentions
     When user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" joins room "file welcome (2).txt room" with 200
     And user "participant2" joins room "file welcome (2).txt room" with 200
-    And user "participant1" is participant of room "file welcome (2).txt room"
-    And user "participant2" is participant of room "file welcome (2).txt room"
+    And user "participant1" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file welcome (2).txt room" for "unknown" with 200
     And user "participant2" gets the following candidate mentions in room "file welcome (2).txt room" for "unknown" with 200
 
@@ -314,8 +314,8 @@ Feature: chat/mentions
     When user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" joins room "file welcome (2).txt room" with 200
     And user "participant2" joins room "file welcome (2).txt room" with 200
-    And user "participant1" is participant of room "file welcome (2).txt room"
-    And user "participant2" is participant of room "file welcome (2).txt room"
+    And user "participant1" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
     Then user "participant3" gets the following candidate mentions in room "file welcome (2).txt room" for "" with 404
 
   Scenario: mention a participant with access to the file but not joined in a file room
@@ -323,10 +323,10 @@ Feature: chat/mentions
     And user "participant2" accepts last share
     And user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant1" joins room "file welcome.txt room" with 200
-    And user "participant1" is participant of room "file welcome.txt room"
-    And user "participant2" is not participant of room "file welcome.txt room"
+    And user "participant1" is participant of room "file welcome.txt room" (v4)
+    And user "participant2" is not participant of room "file welcome.txt room" (v4)
     When user "participant1" sends message "hi @participant2" to room "file welcome.txt room" with 201
-    Then user "participant2" is participant of room "file welcome.txt room"
+    Then user "participant2" is participant of room "file welcome.txt room" (v4)
 
 
 
@@ -336,8 +336,8 @@ Feature: chat/mentions
     And user "participant1" shares "welcome.txt" by link with OCS 100
     When user "participant1" gets the room for last share with 200
     And user "participant1" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant2" is not participant of room "file last share room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file last share room" for "" with 200
       | id           | label                    | source |
       | all          | welcome.txt              | calls  |
@@ -365,10 +365,10 @@ Feature: chat/mentions
     # to be able to join it.
     And user "guest" gets the room for last share with 200
     And user "guest" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant2" is participant of room "file last share room"
-    And user "participant3" is participant of room "file last share room"
-    And user "guest" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant2" is participant of room "file last share room" (v4)
+    And user "participant3" is participant of room "file last share room" (v4)
+    And user "guest" is participant of room "file last share room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file last share room" for "" with 200
       | id           | label                    | source |
       | all          | welcome.txt              | calls  |
@@ -419,10 +419,10 @@ Feature: chat/mentions
     # to be able to join it.
     And user "guest" gets the room for last share with 200
     And user "guest" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant2" is participant of room "file last share room"
-    And user "participant3" is participant of room "file last share room"
-    And user "guest" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant2" is participant of room "file last share room" (v4)
+    And user "participant3" is participant of room "file last share room" (v4)
+    And user "guest" is participant of room "file last share room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file last share room" for "part" with 200
       | id           | label                    | source |
       | participant2 | participant2-displayname | users  |
@@ -466,10 +466,10 @@ Feature: chat/mentions
     # to be able to join it.
     And user "guest" gets the room for last share with 200
     And user "guest" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant2" is participant of room "file last share room"
-    And user "participant3" is participant of room "file last share room"
-    And user "guest" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant2" is participant of room "file last share room" (v4)
+    And user "participant3" is participant of room "file last share room" (v4)
+    And user "guest" is participant of room "file last share room" (v4)
     Then user "participant1" gets the following candidate mentions in room "file last share room" for "unknown" with 200
     And user "participant2" gets the following candidate mentions in room "file last share room" for "unknown" with 200
     And user "participant3" gets the following candidate mentions in room "file last share room" for "unknown" with 200
@@ -482,8 +482,8 @@ Feature: chat/mentions
     When user "participant2" gets the room for last share with 200
     And user "participant1" joins room "file last share room" with 200
     And user "participant2" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant2" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant2" is participant of room "file last share room" (v4)
     Then user "participant3" gets the following candidate mentions in room "file last share room" for "" with 404
     And user "guest" gets the following candidate mentions in room "file last share room" for "" with 404
 
@@ -493,10 +493,10 @@ Feature: chat/mentions
     And user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant1" gets the room for last share with 200
     And user "participant1" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant2" is not participant of room "file last share room" (v4)
     When user "participant1" sends message "hi @participant2" to room "file last share room" with 201
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: mention a participant with access to the file but not joined by self-joined user and guest in a room for a file shared by link
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -512,10 +512,10 @@ Feature: chat/mentions
     # to be able to join it.
     And user "guest" gets the room for last share with 200
     And user "guest" joins room "file last share room" with 200
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant2" is not participant of room "file last share room" (v4)
     When user "participant3" sends message "hi @participant2" to room "file last share room" with 201
     And user "guest" sends message "hello @participant2" to room "file last share room" with 201
-    Then user "participant2" is not participant of room "file last share room"
+    Then user "participant2" is not participant of room "file last share room" (v4)
 
   Scenario: mention a participant without access to the file but joined in a room for a file shared by link
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -529,8 +529,8 @@ Feature: chat/mentions
     And user "participant3" logs in
     And user "participant3" gets the room for last share with 200
     And user "participant3" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
-    And user "participant3" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
+    And user "participant3" is participant of room "file last share room" (v4)
     When user "participant1" sends message "hi @participant3" to room "file last share room" with 201
     And user "participant3" leaves room "file last share room" with 200
-    Then user "participant3" is not participant of room "file last share room"
+    Then user "participant3" is not participant of room "file last share room" (v4)
diff --git a/tests/integration/features/chat/one-to-one.feature b/tests/integration/features/chat/one-to-one.feature
index aa2da66ee..f2d61471e 100644
--- a/tests/integration/features/chat/one-to-one.feature
+++ b/tests/integration/features/chat/one-to-one.feature
@@ -58,12 +58,12 @@ Feature: chat/one-to-one
     Given user "participant1" creates room "one-to-one room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "one-to-one room"
-    And user "participant2" is participant of room "one-to-one room"
+    And user "participant1" is participant of room "one-to-one room" (v4)
+    And user "participant2" is participant of room "one-to-one room" (v4)
     When user "participant1" removes themselves from room "one-to-one room" with 200
-    Then user "participant1" is not participant of room "one-to-one room"
+    Then user "participant1" is not participant of room "one-to-one room" (v4)
     When user "participant2" sends message "Message" to room "one-to-one room" with 201
-    Then user "participant1" is participant of room "one-to-one room"
+    Then user "participant1" is participant of room "one-to-one room" (v4)
     Then user "participant1" sees the following messages in room "one-to-one room" with 200
       | room            | actorType | actorId      | actorDisplayName         | message   | messageParameters |
       | one-to-one room | users     | participant2 | participant2-displayname | Message   | []                |
diff --git a/tests/integration/features/command/create.feature b/tests/integration/features/command/create.feature
index a9623eaf7..e8c207c1f 100644
--- a/tests/integration/features/command/create.feature
+++ b/tests/integration/features/command/create.feature
@@ -11,53 +11,63 @@ Feature: create
     And the command output contains the text "Room successfully created"
     Then the command was successful
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | participantType | participants |
-      | room1 | 2    | 3               | participant1-displayname |
+      | name  | type | participantType |
+      | room1 | 2    | 3               |
+    And user "participant1" sees the following attendees in room "room1" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 3               |
 
   Scenario: Create a group room for participant1 as moderator
     Given invoking occ with "talk:room:create room1 --user participant1 --moderator participant1"
     And the command output contains the text "Room successfully created"
     Then the command was successful
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | participantType | participants |
-      | room1 | 2    | 2               | participant1-displayname |
+      | name  | type | participantType |
+      | room1 | 2    | 2               |
+    And user "participant1" sees the following attendees in room "room1" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 2               |
 
   Scenario: Create a group room for participant1 as owner
     Given invoking occ with "talk:room:create room1 --user participant1 --owner participant1"
     And the command output contains the text "Room successfully created"
     Then the command was successful
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | participantType | participants |
-      | room1 | 2    | 1               | participant1-displayname |
+      | name  | type | participantType |
+      | room1 | 2    | 1               |
+    And user "participant1" sees the following attendees in room "room1" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
 
   Scenario: Create a public room for participant1 as owner group1 as users
     Given invoking occ with "talk:room:create room1 --user participant1 --owner participant1 --public --group group1"
     And the command output contains the text "Room successfully created"
     Then the command was successful
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | participantType | participants |
-      | room1 | 3    | 1               | participant1-displayname, participant2-displayname |
+      | name  | type | participantType |
+      | room1 | 3    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | participantType | participants |
-      | room1 | 3    | 3               | participant1-displayname, participant2-displayname |
+      | name  | type | participantType |
+      | room1 | 3    | 3               |
+    And user "participant1" sees the following attendees in room "room1" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 3               |
 
   Scenario: Create a public room for participant1 as owner group1 as users with password and readonly and listable
     Given invoking occ with "talk:room:create room1 --user participant1 --owner participant1 --public --group group1 --readonly --listable 2 --password test"
     And the command output contains the text "Room successfully created"
     Then the command was successful
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | readOnly | hasPassword | participantType | participants |
-      | room1 | 3    | 1        | 1           | 1               | participant1-displayname, participant2-displayname |
+      | name  | type | readOnly | hasPassword | participantType |
+      | room1 | 3    | 1        | 1           | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | name  | type | readOnly | hasPassword | participantType | participants |
-      | room1 | 3    | 1        | 1           | 3               | participant1-displayname, participant2-displayname |
+      | name  | type | readOnly | hasPassword | participantType |
+      | room1 | 3    | 1        | 1           | 3               |
+    And user "participant1" sees the following attendees in room "room1" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 3               |
 
 
 
diff --git a/tests/integration/features/conversation/add-participant.feature b/tests/integration/features/conversation/add-participant.feature
index d15099ce6..ce71161f0 100644
--- a/tests/integration/features/conversation/add-participant.feature
+++ b/tests/integration/features/conversation/add-participant.feature
@@ -10,14 +10,16 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname |
-    And user "participant3" is not participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 3               |
+    And user "participant3" is not participant of room "room" (v4)
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 3               |
 
   Scenario: User invites a user
     Given user "participant1" creates room "room" (v4)
@@ -25,24 +27,18 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname |
-    And user "participant3" is not participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 3               |
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant2" adds "participant3" to room "room" with 403
-    Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname |
-    And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname |
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 3               |
 
   Scenario: Moderator invites a user
     Given user "participant1" creates room "room" (v4)
@@ -51,38 +47,45 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     When user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 2               | participant1-displayname, participant2-displayname |
-    And user "participant3" is not participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 2               |
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant2" adds "participant3" to room "room" with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname, participant3-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 2               | participant1-displayname, participant2-displayname, participant3-displayname |
+      | id   | type | participantType |
+      | room | 3    | 2               |
     And user "participant3" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname, participant3-displayname |
+      | id   | type | participantType |
+      | room | 3    | 3               |
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 2               |
+      | users      | participant3 | 3               |
 
   Scenario: Moderator invites a user who self-joined
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant2" joins room "room" with 200
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 5               |
     When user "participant1" adds "participant2" to room "room" with 200
     Then user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 3    | 3               |
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 3               |
 
   Scenario: Moderator invites a group containing a self-joined user
     Given group "group1" exists
@@ -96,22 +99,24 @@ Feature: public
     And user "participant1" adds "participant3" to room "room" with 200
     When user "participant1" adds group "group1" to room "room" with 200
     Then user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname, participant3-displayname |
+      | id   | type | participantType |
+      | room | 3    | 3               |
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 3               |
+      | users      | participant3 | 3               |
     And user "participant3" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname, participant3-displayname |
+      | id   | type | participantType |
+      | room | 3    | 3               |
 
   Scenario: Stranger invites a user
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant3" adds "participant2" to room "room" with 404
-    Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname |
-    And user "participant2" is not participant of room "room"
-    And user "participant3" is not participant of room "room"
+    And user "participant1" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+    And user "participant2" is not participant of room "room" (v4)
+    And user "participant3" is not participant of room "room" (v4)
diff --git a/tests/integration/features/conversation/delete-room.feature b/tests/integration/features/conversation/delete-room.feature
index 341400525..2f4ec1716 100644
--- a/tests/integration/features/conversation/delete-room.feature
+++ b/tests/integration/features/conversation/delete-room.feature
@@ -11,10 +11,10 @@ Feature: public
     Then user "participant1" is participant of the following rooms (v4)
       | id   | type | participantType |
       | room | 3    | 1               |
-    And user "participant2" is not participant of room "room"
-    And user "participant3" is not participant of room "room"
+    And user "participant2" is not participant of room "room" (v4)
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant1" deletes room "room" with 200
-    Then user "participant1" is not participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
 
   Scenario: Moderator deletes
     Given user "participant1" creates room "room" (v4)
@@ -25,11 +25,11 @@ Feature: public
     And user "participant2" is participant of the following rooms (v4)
       | id   | type | participantType |
       | room | 3    | 2               |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" deletes room "room" with 200
-    Then user "participant1" is not participant of room "room"
-    And user "participant2" is not participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
 
   Scenario: User deletes
     Given user "participant1" creates room "room" (v4)
@@ -39,18 +39,18 @@ Feature: public
     And user "participant2" is participant of the following rooms (v4)
       | id   | type | participantType |
       | room | 3    | 3               |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" deletes room "room" with 403
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
 
   Scenario: Stranger deletes
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
     When user "participant2" deletes room "room" with 404
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
diff --git a/tests/integration/features/conversation/files.feature b/tests/integration/features/conversation/files.feature
index 99e4c1e52..67b773581 100644
--- a/tests/integration/features/conversation/files.feature
+++ b/tests/integration/features/conversation/files.feature
@@ -20,8 +20,8 @@ Feature: conversation/files
     And user "participant2" accepts last share
     When user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" gets the room for path "welcome (2).txt" with 200
-    Then user "participant1" is not participant of room "file welcome (2).txt room"
-    And user "participant2" is not participant of room "file welcome (2).txt room"
+    Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is not participant of room "file welcome (2).txt room" (v4)
 
   Scenario: get room for folder shared with user
     Given user "participant1" creates folder "/test"
@@ -37,8 +37,8 @@ Feature: conversation/files
     And user "participant2" accepts last share
     When user "participant1" gets the room for path "test/renamed.txt" with 200
     And user "participant2" gets the room for path "test/renamed.txt" with 200
-    Then user "participant1" is not participant of room "file test/renamed.txt room"
-    And user "participant2" is not participant of room "file test/renamed.txt room"
+    Then user "participant1" is not participant of room "file test/renamed.txt room" (v4)
+    And user "participant2" is not participant of room "file test/renamed.txt room" (v4)
 
   Scenario: get room for file in folder reshared with user
     Given user "participant1" creates folder "/test"
@@ -50,9 +50,9 @@ Feature: conversation/files
     When user "participant1" gets the room for path "test/renamed.txt" with 200
     And user "participant2" gets the room for path "test/renamed.txt" with 200
     And user "participant3" gets the room for path "test/renamed.txt" with 200
-    Then user "participant1" is not participant of room "file test/renamed.txt room"
-    And user "participant2" is not participant of room "file test/renamed.txt room"
-    And user "participant3" is not participant of room "file test/renamed.txt room"
+    Then user "participant1" is not participant of room "file test/renamed.txt room" (v4)
+    And user "participant2" is not participant of room "file test/renamed.txt room" (v4)
+    And user "participant3" is not participant of room "file test/renamed.txt room" (v4)
 
   Scenario: get room for file no longer shared
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -67,8 +67,8 @@ Feature: conversation/files
     And user "participant2" accepts last share
     When user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" gets the room for path "welcome (2).txt" with 200
-    Then user "participant1" is not participant of room "file welcome (2).txt room"
-    And user "participant2" is not participant of room "file welcome (2).txt room"
+    Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is not participant of room "file welcome (2).txt room" (v4)
 
   Scenario: get room for file shared with user and group
     Given user "participant1" shares "welcome.txt" with group "group1" with OCS 100
@@ -78,9 +78,9 @@ Feature: conversation/files
     When user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant3" gets the room for path "welcome (2).txt" with 200
-    Then user "participant1" is not participant of room "file welcome (2).txt room"
-    And user "participant2" is not participant of room "file welcome (2).txt room"
-    And user "participant3" is not participant of room "file welcome (2).txt room"
+    Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is not participant of room "file welcome (2).txt room" (v4)
+    And user "participant3" is not participant of room "file welcome (2).txt room" (v4)
 
 
 
@@ -92,10 +92,10 @@ Feature: conversation/files
     And user "participant2" gets the room for last share with 200
     And user "participant3" gets the room for last share with 200
     And user "guest" gets the room for last share with 200
-    Then user "participant1" is not participant of room "file last share room"
-    And user "participant2" is not participant of room "file last share room"
-    And user "participant3" is not participant of room "file last share room"
-    And user "guest" is not participant of room "file last share room"
+    Then user "participant1" is not participant of room "file last share room" (v4)
+    And user "participant2" is not participant of room "file last share room" (v4)
+    And user "participant3" is not participant of room "file last share room" (v4)
+    And user "guest" is not participant of room "file last share room" (v4)
 
   Scenario: get room for link share protected by password
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -127,13 +127,13 @@ Feature: conversation/files
   Scenario: get room for file shared by link
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     When user "participant1" gets the room for path "welcome.txt" with 200
-    Then user "participant1" is not participant of room "file welcome.txt room"
+    Then user "participant1" is not participant of room "file welcome.txt room" (v4)
 
   Scenario: get room for file shared by link and protected by password
     Given user "participant1" shares "welcome.txt" by link with OCS 100
       | password | 123456 |
     When user "participant1" gets the room for path "welcome.txt" with 200
-    Then user "participant1" is not participant of room "file welcome.txt room"
+    Then user "participant1" is not participant of room "file welcome.txt room" (v4)
 
   Scenario: get room for folder shared by link
     Given user "participant1" creates folder "/test"
@@ -154,8 +154,8 @@ Feature: conversation/files
     And user "participant2" accepts last share
     When user "participant1" gets the room for path "test/renamed.txt" with 200
     And user "participant2" gets the room for path "test/renamed.txt" with 200
-    Then user "participant1" is not participant of room "file test/renamed.txt room"
-    And user "participant2" is not participant of room "file test/renamed.txt room"
+    Then user "participant1" is not participant of room "file test/renamed.txt room" (v4)
+    And user "participant2" is not participant of room "file test/renamed.txt room" (v4)
 
   Scenario: get room for file shared with user and by link
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -163,8 +163,8 @@ Feature: conversation/files
     And user "participant2" accepts last share
     When user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" gets the room for path "welcome (2).txt" with 200
-    Then user "participant1" is not participant of room "file welcome (2).txt room"
-    And user "participant2" is not participant of room "file welcome (2).txt room"
+    Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is not participant of room "file welcome (2).txt room" (v4)
 
   Scenario: get room for last link share also shared with user
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -172,8 +172,8 @@ Feature: conversation/files
     And user "participant1" shares "welcome.txt" by link with OCS 100
     When user "participant1" gets the room for last share with 200
     And user "participant2" gets the room for last share with 200
-    Then user "participant1" is not participant of room "file welcome (2).txt room"
-    And user "participant2" is not participant of room "file welcome (2).txt room"
+    Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is not participant of room "file welcome (2).txt room" (v4)
 
 
 
@@ -182,14 +182,14 @@ Feature: conversation/files
     And user "participant2" accepts last share
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     When user "participant1" joins room "file welcome (2).txt room" with 200
-    Then user "participant1" is participant of room "file welcome (2).txt room"
+    Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
 
   Scenario: user with access to a file can join its room
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
     And user "participant2" accepts last share
     And user "participant1" gets the room for path "welcome.txt" with 200
     When user "participant2" joins room "file welcome.txt room" with 200
-    Then user "participant2" is participant of room "file welcome.txt room"
+    Then user "participant2" is participant of room "file welcome.txt room" (v4)
 
   Scenario: owner of a file in a shared folder can join its room
     Given user "participant1" creates folder "/test"
@@ -198,7 +198,7 @@ Feature: conversation/files
     And user "participant2" accepts last share
     And user "participant2" gets the room for path "test/renamed.txt" with 200
     When user "participant1" joins room "file test/renamed.txt room" with 200
-    Then user "participant1" is participant of room "file test/renamed.txt room"
+    Then user "participant1" is participant of room "file test/renamed.txt room" (v4)
 
   Scenario: user with access to a file in a shared folder can join its room
     Given user "participant1" creates folder "/test"
@@ -207,7 +207,7 @@ Feature: conversation/files
     And user "participant2" accepts last share
     And user "participant1" gets the room for path "test/renamed.txt" with 200
     When user "participant2" joins room "file test/renamed.txt room" with 200
-    Then user "participant2" is participant of room "file test/renamed.txt room"
+    Then user "participant2" is participant of room "file test/renamed.txt room" (v4)
 
   Scenario: user with access to a file in a reshared folder can join its room
     Given user "participant1" creates folder "/test"
@@ -218,7 +218,7 @@ Feature: conversation/files
     And user "participant3" accepts last share
     And user "participant3" gets the room for path "test/renamed.txt" with 200
     When user "participant3" joins room "file test/renamed.txt room" with 200
-    Then user "participant3" is participant of room "file test/renamed.txt room"
+    Then user "participant3" is participant of room "file test/renamed.txt room" (v4)
 
   Scenario: owner of a no longer shared file can not join its room
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -226,7 +226,7 @@ Feature: conversation/files
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" deletes last share
     When user "participant1" joins room "file welcome (2).txt room" with 404
-    Then user "participant1" is not participant of room "file welcome (2).txt room"
+    Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
 
   Scenario: user no longer with access to a file can not join its room
     Given user "participant1" shares "welcome.txt" with user "participant3" with OCS 100
@@ -236,14 +236,14 @@ Feature: conversation/files
     And user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant1" deletes last share
     When user "participant2" joins room "file welcome.txt room" with 404
-    Then user "participant2" is not participant of room "file welcome.txt room"
+    Then user "participant2" is not participant of room "file welcome.txt room" (v4)
 
   Scenario: user without access to a file can not join its room
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
     And user "participant2" accepts last share
     And user "participant1" gets the room for path "welcome.txt" with 200
     When user "participant3" joins room "file welcome.txt room" with 404
-    Then user "participant3" is not participant of room "file welcome.txt room"
+    Then user "participant3" is not participant of room "file welcome.txt room" (v4)
 
   Scenario: guest can not join a file room
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -260,8 +260,8 @@ Feature: conversation/files
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     When user "participant1" joins room "file welcome.txt room" with 200
     And user "participant2" joins room "file welcome.txt room" with 200
-    Then user "participant1" is participant of room "file welcome (2).txt room"
-    And user "participant2" is participant of room "file welcome (2).txt room"
+    Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
 
   Scenario: join room for file shared with user and group
     Given user "participant1" shares "welcome.txt" with group "group1" with OCS 100
@@ -274,9 +274,9 @@ Feature: conversation/files
     When user "participant1" joins room "file welcome.txt room" with 200
     And user "participant2" joins room "file welcome.txt room" with 200
     And user "participant3" joins room "file welcome.txt room" with 200
-    Then user "participant1" is participant of room "file welcome (2).txt room"
-    And user "participant2" is participant of room "file welcome (2).txt room"
-    And user "participant3" is participant of room "file welcome (2).txt room"
+    Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
+    And user "participant3" is participant of room "file welcome (2).txt room" (v4)
 
 
 
@@ -284,7 +284,7 @@ Feature: conversation/files
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant1" gets the room for last share with 200
     When user "participant1" joins room "file last share room" with 200
-    Then user "participant1" is participant of room "file last share room"
+    Then user "participant1" is participant of room "file last share room" (v4)
 
   Scenario: user with access to a file shared by link can join its room
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -292,7 +292,7 @@ Feature: conversation/files
     And user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant2" gets the room for last share with 200
     When user "participant2" joins room "file last share room" with 200
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: user without access to a file shared by link can join its room
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -302,13 +302,13 @@ Feature: conversation/files
     And user "participant2" logs in
     And user "participant2" gets the room for last share with 200
     When user "participant2" joins room "file last share room" with 200
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: guest can join the room of a file shared by link
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     And user "guest" gets the room for last share with 200
     When user "guest" joins room "file last share room" with 200
-    And user "guest" is participant of room "file last share room"
+    And user "guest" is participant of room "file last share room" (v4)
 
 
 
@@ -319,9 +319,9 @@ Feature: conversation/files
     # joins the room
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" joins room "file welcome (2).txt room" with 200
-    And user "participant1" is participant of room "file welcome (2).txt room"
+    And user "participant1" is participant of room "file welcome (2).txt room" (v4)
     When user "participant1" leaves room "file welcome (2).txt room" with 200
-    Then user "participant1" is participant of room "file welcome (2).txt room"
+    Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
 
   Scenario: user with access to a file is not removed from its room after leaving it
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -330,9 +330,9 @@ Feature: conversation/files
     # joins the room
     And user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" joins room "file welcome.txt room" with 200
-    And user "participant2" is participant of room "file welcome.txt room"
+    And user "participant2" is participant of room "file welcome.txt room" (v4)
     When user "participant2" leaves room "file welcome.txt room" with 200
-    Then user "participant2" is participant of room "file welcome.txt room"
+    Then user "participant2" is participant of room "file welcome.txt room" (v4)
 
 
 
@@ -340,9 +340,9 @@ Feature: conversation/files
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant1" gets the room for last share with 200
     And user "participant1" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
     When user "participant1" leaves room "file last share room" with 200
-    Then user "participant1" is participant of room "file last share room"
+    Then user "participant1" is participant of room "file last share room" (v4)
 
   Scenario: user with access to a file shared by link is not removed from its room after leaving it
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -350,9 +350,9 @@ Feature: conversation/files
     And user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant2" gets the room for last share with 200
     And user "participant2" joins room "file last share room" with 200
-    And user "participant2" is participant of room "file last share room"
+    And user "participant2" is participant of room "file last share room" (v4)
     When user "participant2" leaves room "file last share room" with 200
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: user without access to a file shared by link is removed from its room after leaving it
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -362,17 +362,17 @@ Feature: conversation/files
     And user "participant2" logs in
     And user "participant2" gets the room for last share with 200
     And user "participant2" joins room "file last share room" with 200
-    And user "participant2" is participant of room "file last share room"
+    And user "participant2" is participant of room "file last share room" (v4)
     When user "participant2" leaves room "file last share room" with 200
-    Then user "participant2" is not participant of room "file last share room"
+    Then user "participant2" is not participant of room "file last share room" (v4)
 
   Scenario: guest is removed from the room of a file shared by link after leaving it
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     And user "guest" gets the room for last share with 200
     And user "guest" joins room "file last share room" with 200
-    And user "guest" is participant of room "file last share room"
+    And user "guest" is participant of room "file last share room" (v4)
     When user "guest" leaves room "file last share room" with 200
-    And user "guest" is not participant of room "file last share room"
+    And user "guest" is not participant of room "file last share room" (v4)
 
 
 
@@ -383,11 +383,11 @@ Feature: conversation/files
     # joins the room
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant1" joins room "file welcome (2).txt room" with 200
-    And user "participant1" is participant of room "file welcome (2).txt room"
+    And user "participant1" is participant of room "file welcome (2).txt room" (v4)
     When user "participant1" removes themselves from room "file welcome (2).txt room" with 200
-    And user "participant1" is not participant of room "file welcome (2).txt room"
+    And user "participant1" is not participant of room "file welcome (2).txt room" (v4)
     And user "participant1" joins room "file welcome (2).txt room" with 200
-    Then user "participant1" is participant of room "file welcome (2).txt room"
+    Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
 
   Scenario: user with access to a file can join its room again after removing self from it
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -396,11 +396,11 @@ Feature: conversation/files
     # joins the room
     And user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" joins room "file welcome.txt room" with 200
-    And user "participant2" is participant of room "file welcome.txt room"
+    And user "participant2" is participant of room "file welcome.txt room" (v4)
     When user "participant2" removes themselves from room "file welcome.txt room" with 200
-    And user "participant2" is not participant of room "file welcome.txt room"
+    And user "participant2" is not participant of room "file welcome.txt room" (v4)
     And user "participant2" joins room "file welcome.txt room" with 200
-    Then user "participant2" is participant of room "file welcome.txt room"
+    Then user "participant2" is participant of room "file welcome.txt room" (v4)
 
 
 
@@ -408,11 +408,11 @@ Feature: conversation/files
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant1" gets the room for last share with 200
     And user "participant1" joins room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
     When user "participant1" removes themselves from room "file last share room" with 200
-    And user "participant1" is not participant of room "file last share room"
+    And user "participant1" is not participant of room "file last share room" (v4)
     And user "participant1" joins room "file last share room" with 200
-    Then user "participant1" is participant of room "file last share room"
+    Then user "participant1" is participant of room "file last share room" (v4)
 
   Scenario: user with access to a file shared by link can join its room again after removing self from it
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -420,11 +420,11 @@ Feature: conversation/files
     And user "participant1" shares "welcome.txt" by link with OCS 100
     And user "participant2" gets the room for last share with 200
     And user "participant2" joins room "file last share room" with 200
-    And user "participant2" is participant of room "file last share room"
+    And user "participant2" is participant of room "file last share room" (v4)
     When user "participant2" removes themselves from room "file last share room" with 200
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant2" is not participant of room "file last share room" (v4)
     And user "participant2" joins room "file last share room" with 200
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: user without access to a file shared by link can join its room again after removing self from it
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -434,11 +434,11 @@ Feature: conversation/files
     And user "participant2" logs in
     And user "participant2" gets the room for last share with 200
     And user "participant2" joins room "file last share room" with 200
-    And user "participant2" is participant of room "file last share room"
+    And user "participant2" is participant of room "file last share room" (v4)
     When user "participant2" removes themselves from room "file last share room" with 200
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant2" is not participant of room "file last share room" (v4)
     And user "participant2" joins room "file last share room" with 200
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
 
   # Guests can not remove themselves from a room.
 
@@ -453,11 +453,11 @@ Feature: conversation/files
     And user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant1" joins room "file welcome.txt room" with 200
     And user "participant1" leaves room "file welcome.txt room" with 200
-    And user "participant1" is participant of room "file welcome.txt room"
+    And user "participant1" is participant of room "file welcome.txt room" (v4)
     When user "participant1" deletes last share
-    Then user "participant1" is participant of room "file welcome.txt room"
+    Then user "participant1" is participant of room "file welcome.txt room" (v4)
     And user "participant1" joins room "file welcome.txt room" with 404
-    And user "participant1" is not participant of room "file welcome.txt room"
+    And user "participant1" is not participant of room "file welcome.txt room" (v4)
 
   Scenario: user is not participant of room for file no longer with access to it
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -465,11 +465,11 @@ Feature: conversation/files
     And user "participant2" gets the room for path "welcome (2).txt" with 200
     And user "participant2" joins room "file welcome (2).txt room" with 200
     And user "participant2" leaves room "file welcome (2).txt room" with 200
-    And user "participant2" is participant of room "file welcome (2).txt room"
+    And user "participant2" is participant of room "file welcome (2).txt room" (v4)
     When user "participant1" deletes last share
-    Then user "participant2" is participant of room "file welcome (2).txt room"
+    Then user "participant2" is participant of room "file welcome (2).txt room" (v4)
     And user "participant2" joins room "file welcome (2).txt room" with 404
-    And user "participant2" is not participant of room "file welcome (2).txt room"
+    And user "participant2" is not participant of room "file welcome (2).txt room" (v4)
 
 
 
@@ -478,11 +478,11 @@ Feature: conversation/files
     And user "participant1" gets the room for last share with 200
     And user "participant1" joins room "file last share room" with 200
     And user "participant1" leaves room "file last share room" with 200
-    And user "participant1" is participant of room "file last share room"
+    And user "participant1" is participant of room "file last share room" (v4)
     When user "participant1" deletes last share
-    Then user "participant1" is participant of room "file last share room"
+    Then user "participant1" is participant of room "file last share room" (v4)
     And user "participant1" joins room "file last share room" with 404
-    And user "participant1" is not participant of room "file last share room"
+    And user "participant1" is not participant of room "file last share room" (v4)
 
   Scenario: user is participant of room for file no longer shared by link but with access to it
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
@@ -491,13 +491,13 @@ Feature: conversation/files
     And user "participant2" gets the room for last share with 200
     And user "participant2" joins room "file last share room" with 200
     And user "participant2" leaves room "file last share room" with 200
-    And user "participant2" is participant of room "file last share room"
+    And user "participant2" is participant of room "file last share room" (v4)
     When user "participant1" deletes last share
-    Then user "participant2" is participant of room "file last share room"
+    Then user "participant2" is participant of room "file last share room" (v4)
     # Although the room was created for the shared link it will still be
     # available to other types of shares after the shared link is deleted.
     And user "participant2" joins room "file last share room" with 200
-    And user "participant2" is participant of room "file last share room"
+    And user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: user is not participant of room for file no longer shared by link and without access to it
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -508,11 +508,11 @@ Feature: conversation/files
     And user "participant2" gets the room for last share with 200
     And user "participant2" joins room "file last share room" with 200
     And user "participant2" leaves room "file last share room" with 200
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant2" is not participant of room "file last share room" (v4)
     When user "participant1" deletes last share
-    Then user "participant2" is not participant of room "file last share room"
+    Then user "participant2" is not participant of room "file last share room" (v4)
     And user "participant2" joins room "file last share room" with 404
-    And user "participant2" is not participant of room "file last share room"
+    And user "participant2" is not participant of room "file last share room" (v4)
 
   Scenario: guest is not participant of room for file no longer shared by link
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -520,6 +520,6 @@ Feature: conversation/files
     And user "guest" joins room "file last share room" with 200
     And user "guest" leaves room "file last share room" with 200
     When user "participant1" deletes last share
-    Then user "guest" is not participant of room "file last share room"
+    Then user "guest" is not participant of room "file last share room" (v4)
     And user "guest" joins room "file last share room" with 404
-    And user "guest" is not participant of room "file last share room"
+    And user "guest" is not participant of room "file last share room" (v4)
diff --git a/tests/integration/features/conversation/join-leave.feature b/tests/integration/features/conversation/join-leave.feature
index 27aae13e1..8fc52f342 100644
--- a/tests/integration/features/conversation/join-leave.feature
+++ b/tests/integration/features/conversation/join-leave.feature
@@ -13,10 +13,10 @@ Feature: conversation/join-leave
     And user "participant2" joins room "room" with 200
     And user "participant3" joins room "room" with 404
     And user "guest" joins room "room" with 404
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
-    And user "participant3" is not participant of room "room"
-    And user "guest" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
+    And user "participant3" is not participant of room "room" (v4)
+    And user "guest" is not participant of room "room" (v4)
 
   Scenario: leave a one-to-one room
     Given user "participant1" creates room "room" (v4)
@@ -26,8 +26,8 @@ Feature: conversation/join-leave
     And user "participant2" joins room "room" with 200
     When user "participant1" leaves room "room" with 200
     And user "participant2" leaves room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
 
 
 
@@ -40,10 +40,10 @@ Feature: conversation/join-leave
     And user "participant2" joins room "room" with 200
     And user "participant3" joins room "room" with 404
     And user "guest" joins room "room" with 404
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
-    And user "participant3" is not participant of room "room"
-    And user "guest" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
+    And user "participant3" is not participant of room "room" (v4)
+    And user "guest" is not participant of room "room" (v4)
 
   Scenario: leave a group room
     Given user "participant1" creates room "room" (v4)
@@ -54,8 +54,8 @@ Feature: conversation/join-leave
     And user "participant2" joins room "room" with 200
     When user "participant1" leaves room "room" with 200
     And user "participant2" leaves room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
 
 
 
@@ -68,10 +68,10 @@ Feature: conversation/join-leave
     And user "participant2" joins room "room" with 200
     And user "participant3" joins room "room" with 200
     And user "guest" joins room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
-    And user "participant3" is participant of room "room"
-    And user "guest" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
+    And user "participant3" is participant of room "room" (v4)
+    And user "guest" is participant of room "room" (v4)
 
   Scenario: leave a public room
     Given user "participant1" creates room "room" (v4)
@@ -86,7 +86,7 @@ Feature: conversation/join-leave
     And user "participant2" leaves room "room" with 200
     And user "participant3" leaves room "room" with 200
     And user "guest" leaves room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
-    And user "participant3" is not participant of room "room"
-    And user "guest" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
+    And user "participant3" is not participant of room "room" (v4)
+    And user "guest" is not participant of room "room" (v4)
diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation/lobby.feature
index 13cf79bce..9c141cc3a 100644
--- a/tests/integration/features/conversation/lobby.feature
+++ b/tests/integration/features/conversation/lobby.feature
@@ -231,21 +231,21 @@ Feature: conversation/lobby
     When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4)
     And user "participant1" sends message "Message 1" to room "room" with 201
     And user "participant1" sets description for room "room" to "the description" with 200
-    Then user "participant1" is participant of room "room" (v3)
+    Then user "participant1" is participant of room "room" (v4)
       | name | description     | type | participantType | lastMessage                                  |
       | room | the description | 3    | 1               | You set the description to "the description" |
-    And user "participant2" is participant of room "room" (v3)
+    And user "participant2" is participant of room "room" (v4)
       | name | description     | type | participantType | lastMessage                                      |
       | room | the description | 3    | 2               | {actor} set the description to "the description" |
-    And user "participant3" is participant of room "room" (v3)
+    And user "participant3" is participant of room "room" (v4)
       | name | description     | type | participantType | lastMessage |
       | room | the description | 3    | 3               |             |
-    And user "participant4" is participant of room "room" (v3)
+    And user "participant4" is participant of room "room" (v4)
       | name | description     | type | participantType | lastMessage |
       | room | the description | 3    | 5               |             |
-    And user "guest" is participant of room "room" (v3)
+    And user "guest" is participant of room "room" (v4)
       | name | description     | type | participantType | lastMessage                                       |
       | room | the description | 3    | 6               | {actor} set the description to "the description"  |
-    And user "guest2" is participant of room "room" (v3)
+    And user "guest2" is participant of room "room" (v4)
       | name | description     | type | participantType | lastMessage |
       | room | the description | 3    | 4               |             |
diff --git a/tests/integration/features/conversation/one-to-one.feature b/tests/integration/features/conversation/one-to-one.feature
index 7a0f098e0..bbafc17b7 100644
--- a/tests/integration/features/conversation/one-to-one.feature
+++ b/tests/integration/features/conversation/one-to-one.feature
@@ -19,67 +19,67 @@ Feature: one-to-one
       | roomType | 1 |
       | invite   | participant2 |
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id    | type | participantType | participants |
-      | room1 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id    | type | participantType |
+      | room1 | 1    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id    | type | participantType | participants |
-      | room1 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id    | type | participantType |
+      | room1 | 1    | 1               |
     And user "participant3" is participant of the following rooms (v4)
-    And user "participant1" is participant of room "room1"
-    And user "participant2" is participant of room "room1"
-    And user "participant3" is not participant of room "room1"
+    And user "participant1" is participant of room "room1" (v4)
+    And user "participant2" is participant of room "room1" (v4)
+    And user "participant3" is not participant of room "room1" (v4)
 
   Scenario: User1 invites user2 to a one2one room and leaves it
     Given user "participant1" creates room "room2" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room2"
-    And user "participant2" is participant of room "room2"
+    And user "participant1" is participant of room "room2" (v4)
+    And user "participant2" is participant of room "room2" (v4)
     When user "participant1" removes themselves from room "room2" with 200
-    Then user "participant1" is not participant of room "room2"
+    Then user "participant1" is not participant of room "room2" (v4)
     And user "participant1" is participant of the following rooms (v4)
-    And user "participant2" is participant of room "room2"
+    And user "participant2" is participant of room "room2" (v4)
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id    | type | participantType | participants |
-      | room2 | 1    | 1               | participant2-displayname |
+      | id    | type | participantType |
+      | room2 | 1    | 1               |
+    And user "participant2" sees the following attendees in room "room2" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant2 | 1               |
 
   Scenario: User1 invites user2 to a one2one room and tries to delete it
     Given user "participant1" creates room "room3" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    Then user "participant1" is participant of room "room3"
-    And user "participant2" is participant of room "room3"
+    Then user "participant1" is participant of room "room3" (v4)
+    And user "participant2" is participant of room "room3" (v4)
     When user "participant1" deletes room "room3" with 400
-    Then user "participant1" is participant of room "room3"
-    And user "participant2" is participant of room "room3"
+    Then user "participant1" is participant of room "room3" (v4)
+    And user "participant2" is participant of room "room3" (v4)
 
   Scenario: User1 invites user2 to a one2one room and tries to remove user2
     Given user "participant1" creates room "room4" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    Then user "participant1" is participant of room "room4"
-    And user "participant2" is participant of room "room4"
+    Then user "participant1" is participant of room "room4" (v4)
+    And user "participant2" is participant of room "room4" (v4)
     When user "participant1" removes "participant2" from room "room4" with 400
-    Then user "participant1" is participant of room "room4"
-    And user "participant2" is participant of room "room4"
+    Then user "participant1" is participant of room "room4" (v4)
+    And user "participant2" is participant of room "room4" (v4)
 
   Scenario: User1 invites user2 to a one2one room and tries to rename it
     Given user "participant1" creates room "room5" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room5"
-    And user "participant2" is participant of room "room5"
+    And user "participant1" is participant of room "room5" (v4)
+    And user "participant2" is participant of room "room5" (v4)
     When user "participant1" renames room "room5" to "new name" with 400
 
   Scenario: User1 invites user2 to a one2one room and tries to make it public
     Given user "participant1" creates room "room6" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room6"
-    And user "participant2" is participant of room "room6"
+    And user "participant1" is participant of room "room6" (v4)
+    And user "participant2" is participant of room "room6" (v4)
     When user "participant1" makes room "room6" public with 400
     Then user "participant1" is participant of the following rooms (v4)
       | id    | type | participantType |
@@ -89,108 +89,106 @@ Feature: one-to-one
     Given user "participant1" creates room "room7" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room7"
-    And user "participant2" is participant of room "room7"
-    And user "participant3" is not participant of room "room7"
+    And user "participant1" is participant of room "room7" (v4)
+    And user "participant2" is participant of room "room7" (v4)
+    And user "participant3" is not participant of room "room7" (v4)
     When user "participant1" adds "participant3" to room "room7" with 400
-    Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id    | type | participantType | participants |
-      | room7 | 1    | 1               | participant1-displayname, participant2-displayname |
-    And user "participant3" is not participant of room "room7"
+    And user "participant3" is not participant of room "room7" (v4)
+    And user "participant1" sees the following attendees in room "room7" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 1               |
 
   Scenario: User1 invites user2 to a one2one room and promote user2 to moderator
     Given user "participant1" creates room "room8" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room8"
-    And user "participant2" is participant of room "room8"
+    And user "participant1" is participant of room "room8" (v4)
+    And user "participant2" is participant of room "room8" (v4)
     When user "participant1" promotes "participant2" in room "room8" with 400
 
   Scenario: User1 invites user2 to a one2one room and demote user2 to moderator
     Given user "participant1" creates room "room9" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room9"
-    And user "participant2" is participant of room "room9"
+    And user "participant1" is participant of room "room9" (v4)
+    And user "participant2" is participant of room "room9" (v4)
     When user "participant1" demotes "participant2" in room "room9" with 400
 
   Scenario: User1 invites user2 to a one2one room and promote non-invited user
     Given user "participant1" creates room "room10" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room10"
-    And user "participant3" is not participant of room "room10"
+    And user "participant1" is participant of room "room10" (v4)
+    And user "participant3" is not participant of room "room10" (v4)
     When user "participant1" promotes "participant3" in room "room10" with 404
 
   Scenario: User1 invites user2 to a one2one room and demote non-invited user
     Given user "participant1" creates room "room11" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room11"
-    And user "participant3" is not participant of room "room11"
+    And user "participant1" is participant of room "room11" (v4)
+    And user "participant3" is not participant of room "room11" (v4)
     When user "participant1" demotes "participant3" in room "room11" with 404
 
   Scenario: User1 invites user2 to a one2one room twice, it's the same room
     Given user "participant1" creates room "room12" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room12"
-    And user "participant2" is participant of room "room12"
+    And user "participant1" is participant of room "room12" (v4)
+    And user "participant2" is participant of room "room12" (v4)
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room12 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room12 | 1    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room12 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room12 | 1    | 1               |
     When user "participant1" creates room "room13" with 200 (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room12"
-    And user "participant2" is participant of room "room12"
+    And user "participant1" is participant of room "room12" (v4)
+    And user "participant2" is participant of room "room12" (v4)
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room12 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room12 | 1    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room12 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room12 | 1    | 1               |
 
   Scenario: User1 invites user2 to a one2one room, leaves and does it again, it's the same room
     Given user "participant1" creates room "room14" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room14"
-    And user "participant2" is participant of room "room14"
+    And user "participant1" is participant of room "room14" (v4)
+    And user "participant2" is participant of room "room14" (v4)
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room14 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room14 | 1    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room14 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room14 | 1    | 1               |
     When user "participant1" removes themselves from room "room14" with 200
-    Then user "participant1" is not participant of room "room14"
+    Then user "participant1" is not participant of room "room14" (v4)
     And user "participant1" is participant of the following rooms (v4)
-    And user "participant2" is participant of room "room14"
+    And user "participant2" is participant of room "room14" (v4)
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room14 | 1    | 1               | participant2-displayname |
+      | id     | type | participantType |
+      | room14 | 1    | 1               |
+    And user "participant2" sees the following attendees in room "room14" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant2 | 1               |
     When user "participant1" creates room "room15" with 200 (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "participant1" is participant of room "room14"
-    And user "participant2" is participant of room "room14"
+    And user "participant1" is participant of room "room14" (v4)
+    And user "participant2" is participant of room "room14" (v4)
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room14 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room14 | 1    | 1               |
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id     | type | participantType | participants |
-      | room14 | 1    | 1               | participant1-displayname, participant2-displayname |
+      | id     | type | participantType |
+      | room14 | 1    | 1               |
+    And user "participant2" sees the following attendees in room "room14" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 1               |
diff --git a/tests/integration/features/conversation/password-request.feature b/tests/integration/features/conversation/password-request.feature
index d8a1b83fe..35899e9c4 100644
--- a/tests/integration/features/conversation/password-request.feature
+++ b/tests/integration/features/conversation/password-request.feature
@@ -10,10 +10,10 @@ Feature: conversation/password-request
       | password | 123456 |
       | sendPasswordByTalk | true |
     When user "guest" creates the password request room for last share with 201
-    Then user "participant1" is participant of room "password request for last share room"
+    Then user "participant1" is participant of room "password request for last share room" (v4)
       | name        | type | participantType | participants |
       | welcome.txt | 3    | 1               | participant1-displayname |
-    And user "guest" is not participant of room "password request for last share room"
+    And user "guest" is not participant of room "password request for last share room" (v4)
 
   Scenario: create password-request room for folder shared by link
     Given user "participant1" creates folder "/test"
@@ -21,10 +21,10 @@ Feature: conversation/password-request
       | password | 123456 |
       | sendPasswordByTalk | true |
     When user "guest" creates the password request room for last share with 201
-    Then user "participant1" is participant of room "password request for last share room"
+    Then user "participant1" is participant of room "password request for last share room" (v4)
       | name | type | participantType | participants |
       | test | 3    | 1               | participant1-displayname |
-    And user "guest" is not participant of room "password request for last share room"
+    And user "guest" is not participant of room "password request for last share room" (v4)
 
   Scenario: create password-request room for folder reshared by link
     Given user "participant1" creates folder "/test"
@@ -33,11 +33,11 @@ Feature: conversation/password-request
       | password | 123456 |
       | sendPasswordByTalk | true |
     When user "guest" creates the password request room for last share with 201
-    Then user "participant2" is participant of room "password request for last share room"
+    Then user "participant2" is participant of room "password request for last share room" (v4)
       | name | type | participantType | participants |
       | test | 3    | 1               | participant2-displayname |
-    And user "participant1" is not participant of room "password request for last share room"
-    And user "guest" is not participant of room "password request for last share room"
+    And user "participant1" is not participant of room "password request for last share room" (v4)
+    And user "guest" is not participant of room "password request for last share room" (v4)
 
   Scenario: create password-request room for file shared by link but not protected by Talk
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -58,7 +58,7 @@ Feature: conversation/password-request
       | sendPasswordByTalk | true |
     And user "guest" creates the password request room for last share with 201
     When user "guest" joins room "password request for last share room" with 200
-    Then user "guest" is participant of room "password request for last share room"
+    Then user "guest" is participant of room "password request for last share room" (v4)
 
   Scenario: user can join the password request room
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -66,7 +66,7 @@ Feature: conversation/password-request
       | sendPasswordByTalk | true |
     And user "participant2" creates the password request room for last share with 201
     When user "participant2" joins room "password request for last share room" with 200
-    Then user "participant2" is participant of room "password request for last share room"
+    Then user "participant2" is participant of room "password request for last share room" (v4)
 
   Scenario: owner can join the password request room
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -82,7 +82,7 @@ Feature: conversation/password-request
     And user "guest" creates the password request room for last share with 201
     And user "guest" joins room "password request for last share room" with 200
     When user "guest2" joins room "password request for last share room" with 404
-    Then user "guest2" is not participant of room "password request for last share room"
+    Then user "guest2" is not participant of room "password request for last share room" (v4)
 
   Scenario: other guests can not join the password request room when a user already joined
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -91,7 +91,7 @@ Feature: conversation/password-request
     And user "participant2" creates the password request room for last share with 201
     And user "participant2" joins room "password request for last share room" with 200
     When user "guest" joins room "password request for last share room" with 404
-    Then user "guest" is not participant of room "password request for last share room"
+    Then user "guest" is not participant of room "password request for last share room" (v4)
 
   Scenario: other users can not join the password request room when a guest already joined
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -100,7 +100,7 @@ Feature: conversation/password-request
     And user "guest" creates the password request room for last share with 201
     And user "guest" joins room "password request for last share room" with 200
     When user "participant2" joins room "password request for last share room" with 404
-    Then user "participant2" is not participant of room "password request for last share room"
+    Then user "participant2" is not participant of room "password request for last share room" (v4)
 
   Scenario: other users can not join the password request room when a user already joined
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -109,7 +109,7 @@ Feature: conversation/password-request
     And user "participant2" creates the password request room for last share with 201
     And user "participant2" joins room "password request for last share room" with 200
     When user "participant3" joins room "password request for last share room" with 404
-    Then user "participant3" is not participant of room "password request for last share room"
+    Then user "participant3" is not participant of room "password request for last share room" (v4)
 
 
 
@@ -120,7 +120,7 @@ Feature: conversation/password-request
     And user "guest" creates the password request room for last share with 201
     And user "participant1" joins room "password request for last share room" with 200
     When user "participant1" adds "participant2" to room "password request for last share room" with 400
-    Then user "participant2" is not participant of room "password request for last share room"
+    Then user "participant2" is not participant of room "password request for last share room" (v4)
 
 
 
@@ -132,8 +132,8 @@ Feature: conversation/password-request
     And user "guest" joins room "password request for last share room" with 200
     And user "participant1" joins room "password request for last share room" with 200
     When user "guest" leaves room "password request for last share room" with 200
-    Then user "participant1" is not participant of room "password request for last share room"
-    And user "guest" is not participant of room "password request for last share room"
+    Then user "participant1" is not participant of room "password request for last share room" (v4)
+    And user "guest" is not participant of room "password request for last share room" (v4)
 
   Scenario: user leaves the password request room
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -143,8 +143,8 @@ Feature: conversation/password-request
     And user "participant2" joins room "password request for last share room" with 200
     And user "participant1" joins room "password request for last share room" with 200
     When user "participant2" leaves room "password request for last share room" with 200
-    Then user "participant1" is not participant of room "password request for last share room"
-    And user "participant2" is not participant of room "password request for last share room"
+    Then user "participant1" is not participant of room "password request for last share room" (v4)
+    And user "participant2" is not participant of room "password request for last share room" (v4)
 
   Scenario: owner leaves the password request room
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -154,8 +154,8 @@ Feature: conversation/password-request
     And user "guest" joins room "password request for last share room" with 200
     And user "participant1" joins room "password request for last share room" with 200
     When user "participant1" leaves room "password request for last share room" with 200
-    Then user "participant1" is not participant of room "password request for last share room"
-    And user "guest" is not participant of room "password request for last share room"
+    Then user "participant1" is not participant of room "password request for last share room" (v4)
+    And user "guest" is not participant of room "password request for last share room" (v4)
 
 
 
diff --git a/tests/integration/features/conversation/public-private.feature b/tests/integration/features/conversation/public-private.feature
index 428345fa8..df786dbd5 100644
--- a/tests/integration/features/conversation/public-private.feature
+++ b/tests/integration/features/conversation/public-private.feature
@@ -9,65 +9,55 @@ Feature: public
       | roomType | 3 |
       | roomName | room |
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     When user "participant1" makes room "room" private with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 2    | 1               | participant1-displayname |
+      | id   | type | participantType |
+      | room | 2    | 1               |
     When user "participant1" makes room "room" public with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
 
   Scenario: Moderator makes room private/public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     When user "participant2" makes room "room" private with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 2    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 2    | 1               |
     When user "participant2" makes room "room" public with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
 
   Scenario: User makes room private/public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     And user "participant1" adds "participant2" to room "room" with 200
     When user "participant2" makes room "room" private with 403
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 3    | 1               |
     When user "participant1" makes room "room" private with 200
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 2    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 2    | 1               |
     When user "participant2" makes room "room" public with 403
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 2    | 1               | participant1-displayname, participant2-displayname |
+      | id   | type | participantType |
+      | room | 2    | 1               |
 
   Scenario: Stranger makes room private/public
     Given user "participant1" creates room "room" (v4)
diff --git a/tests/integration/features/conversation/remove-participant.feature b/tests/integration/features/conversation/remove-participant.feature
index cd7e8e22c..e06c7cf9e 100644
--- a/tests/integration/features/conversation/remove-participant.feature
+++ b/tests/integration/features/conversation/remove-participant.feature
@@ -11,20 +11,20 @@ Feature: public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
     When user "participant1" removes "participant1" from room "room" with 200
-    Then user "participant1" is not participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
 
   Scenario: Owner removes self participant from public room when there are other users in the room
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant1" removes "participant1" from room "room" with 400
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
 
   Scenario: Owner removes self participant from public room when there are other moderators in the room
     Given user "participant1" creates room "room" (v4)
@@ -32,11 +32,11 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant1" removes "participant1" from room "room" with 200
-    Then user "participant1" is not participant of room "room"
-    And user "participant2" is participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
 
 #
 # Removing a moderator
@@ -47,9 +47,9 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant1" removes "participant3" from room "room" with 200
-    Then user "participant3" is not participant of room "room"
+    Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes moderator
     Given user "participant1" creates room "room" (v4)
@@ -59,9 +59,9 @@ Feature: public
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 200
-    Then user "participant3" is not participant of room "room"
+    Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes self participant from empty public room
     Given user "participant1" creates room "room" (v4)
@@ -70,10 +70,10 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" removes "participant1" from room "room" with 200
-    And user "participant1" is not participant of room "room"
-    And user "participant2" is participant of room "room"
+    And user "participant1" is not participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" removes "participant2" from room "room" with 200
-    Then user "participant2" is not participant of room "room"
+    Then user "participant2" is not participant of room "room" (v4)
 
   Scenario: Moderator removes self participant from public room when there are other users in the room
     Given user "participant1" creates room "room" (v4)
@@ -82,13 +82,13 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" removes "participant1" from room "room" with 200
-    And user "participant1" is not participant of room "room"
+    And user "participant1" is not participant of room "room" (v4)
     And user "participant2" adds "participant3" to room "room" with 200
-    And user "participant2" is participant of room "room"
-    And user "participant3" is participant of room "room"
+    And user "participant2" is participant of room "room" (v4)
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant2" from room "room" with 400
-    Then user "participant2" is participant of room "room"
-    And user "participant3" is participant of room "room"
+    Then user "participant2" is participant of room "room" (v4)
+    And user "participant3" is participant of room "room" (v4)
 
   Scenario: Moderator removes self participant from public room when there are other moderators in the room
     Given user "participant1" creates room "room" (v4)
@@ -97,14 +97,14 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" removes "participant1" from room "room" with 200
-    And user "participant1" is not participant of room "room"
+    And user "participant1" is not participant of room "room" (v4)
     And user "participant2" adds "participant3" to room "room" with 200
     And user "participant2" promotes "participant3" in room "room" with 200
-    And user "participant2" is participant of room "room"
-    And user "participant3" is participant of room "room"
+    And user "participant2" is participant of room "room" (v4)
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant2" from room "room" with 200
-    Then user "participant2" is not participant of room "room"
-    And user "participant3" is participant of room "room"
+    Then user "participant2" is not participant of room "room" (v4)
+    And user "participant3" is participant of room "room" (v4)
 
   Scenario: User removes moderator
     Given user "participant1" creates room "room" (v4)
@@ -113,9 +113,9 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 403
-    Then user "participant3" is participant of room "room"
+    Then user "participant3" is participant of room "room" (v4)
 
   Scenario: Stranger removes moderator
     Given user "participant1" creates room "room" (v4)
@@ -123,9 +123,9 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 404
-    Then user "participant3" is participant of room "room"
+    Then user "participant3" is participant of room "room" (v4)
 
 #
 # Removing a user
@@ -135,9 +135,9 @@ Feature: public
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant3" to room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant1" removes "participant3" from room "room" with 200
-    Then user "participant3" is not participant of room "room"
+    Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes user
     Given user "participant1" creates room "room" (v4)
@@ -146,9 +146,9 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 200
-    Then user "participant3" is not participant of room "room"
+    Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: User removes user
     Given user "participant1" creates room "room" (v4)
@@ -156,18 +156,18 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 403
-    Then user "participant3" is participant of room "room"
+    Then user "participant3" is participant of room "room" (v4)
 
   Scenario: Stranger removes user
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant3" to room "room" with 200
-    And user "participant3" is participant of room "room"
+    And user "participant3" is participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 404
-    Then user "participant3" is participant of room "room"
+    Then user "participant3" is participant of room "room" (v4)
 
 #
 # Removing a stranger
@@ -176,9 +176,9 @@ Feature: public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant1" removes "participant3" from room "room" with 404
-    Then user "participant3" is not participant of room "room"
+    Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes stranger
     Given user "participant1" creates room "room" (v4)
@@ -186,23 +186,23 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     When user "participant1" promotes "participant2" in room "room" with 200
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 404
-    Then user "participant3" is not participant of room "room"
+    Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: User removes stranger
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 403
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
 
   Scenario: Stranger removes stranger
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant2" removes "participant3" from room "room" with 404
-    And user "participant3" is not participant of room "room"
+    And user "participant3" is not participant of room "room" (v4)
diff --git a/tests/integration/features/conversation/remove-self.feature b/tests/integration/features/conversation/remove-self.feature
index bc27ff457..b27f9825a 100644
--- a/tests/integration/features/conversation/remove-self.feature
+++ b/tests/integration/features/conversation/remove-self.feature
@@ -9,13 +9,12 @@ Feature: public
       | roomType | 3 |
       | roomName | room |
     Then user "participant1" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 1               | participant1-displayname |
-    And user "participant2" is not participant of room "room"
-    And user "participant3" is not participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 1               |
+    And user "participant2" is not participant of room "room" (v4)
+    And user "participant3" is not participant of room "room" (v4)
     When user "participant1" removes themselves from room "room" with 200
-    Then user "participant1" is not participant of room "room"
+    Then user "participant1" is not participant of room "room" (v4)
 
   Scenario: Moderator removes the room from their room list
     Given user "participant1" creates room "room" (v4)
@@ -24,14 +23,17 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 2               | participant1-displayname, participant2-displayname |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 2               |
+    And user "participant2" sees the following attendees in room "room" with 200 (v3)
+      | actorType  | actorId      | participantType |
+      | users      | participant1 | 1               |
+      | users      | participant2 | 2               |
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" removes themselves from room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
 
   Scenario: Last moderator removes the room from their room list
     Given user "participant1" creates room "room" (v4)
@@ -46,14 +48,13 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 3               | participant1-displayname, participant2-displayname |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 3               |
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" removes themselves from room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
 
   Scenario: Self joined user removes the room from their room list
     Given user "participant1" creates room "room" (v4)
@@ -61,21 +62,20 @@ Feature: public
       | roomName | room |
     And user "participant2" joins room "room" with 200
     And user "participant2" is participant of the following rooms (v4)
-    # FIXME
-      | id   | type | participantType | participants |
-      | room | 3    | 5               | participant1-displayname, participant2-displayname |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is participant of room "room"
+      | id   | type | participantType |
+      | room | 3    | 5               |
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" removes themselves from room "room" with 200
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
 
   Scenario: Stranger removes the room from their room list
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
     When user "participant2" removes themselves from room "room" with 404
-    Then user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
diff --git a/tests/integration/features/conversation/rename-room.feature b/tests/integration/features/conversation/rename-room.feature
index 41e5799ba..6c429a918 100644
--- a/tests/integration/features/conversation/rename-room.feature
+++ b/tests/integration/features/conversation/rename-room.feature
@@ -8,17 +8,17 @@ Feature: public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
     When user "participant1" renames room "room" to "new name" with 200
-    Then user "participant1" is participant of room "room"
+    Then user "participant1" is participant of room "room" (v4)
 
   Scenario: Moderator renames
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
     And user "participant1" adds "participant2" to room "room" with 200
-    And user "participant2" is participant of room "room"
+    And user "participant2" is participant of room "room" (v4)
     And user "participant1" promotes "participant2" in room "room" with 200
     When user "participant2" renames room "room" to "new name" with 200
 
@@ -26,15 +26,15 @@ Feature: public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
     And user "participant1" adds "participant2" to room "room" with 200
-    And user "participant2" is participant of room "room"
+    And user "participant2" is participant of room "room" (v4)
     When user "participant2" renames room "room" to "new name" with 403
 
   Scenario: Stranger renames
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    And user "participant1" is participant of room "room"
-    And user "participant2" is not participant of room "room"
+    And user "participant1" is participant of room "room" (v4)
+    And user "participant2" is not participant of room "room" (v4)
     When user "participant2" renames room "room" to "new name" with 404
diff --git a/tests/integration/features/conversation/set-description.feature b/tests/integration/features/conversation/set-description.feature
index 436cf0516..bb2c819ca 100644
--- a/tests/integration/features/conversation/set-description.feature
+++ b/tests/integration/features/conversation/set-description.feature
@@ -11,7 +11,7 @@ Feature: set-description
       | roomType | 2 |
       | roomName | room |
     When user "owner" sets description for room "group room" to "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C" with 200
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description                                                                                                                                                                                              |
       | 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C |
 
@@ -21,7 +21,7 @@ Feature: set-description
       | roomName | room |
     And user "owner" sets description for room "group room" to "the description" with 200
     When user "owner" sets description for room "group room" to "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678C0" with 400
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description     |
       | the description |
 
@@ -30,7 +30,7 @@ Feature: set-description
       | roomType | 2 |
       | roomName | room |
     When user "owner" sets description for room "group room" to "०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च" with 200
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description                                                                                                                                                                                              |
       | ०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च |
 
@@ -40,7 +40,7 @@ Feature: set-description
       | roomName | room |
     And user "owner" sets description for room "group room" to "the description" with 200
     When user "owner" sets description for room "group room" to "०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८९०१२३४५६७८च०" with 400
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description     |
       | the description |
 
@@ -52,10 +52,10 @@ Feature: set-description
       | invite   | moderator |
     When user "owner" sets description for room "one-to-one room" to "the description" with 400
     And user "moderator" sets description for room "one-to-one room" to "the description" with 400
-    Then user "owner" is participant of room "one-to-one room" (v3)
+    Then user "owner" is participant of room "one-to-one room" (v4)
       | description |
       |             |
-    And user "moderator" is participant of room "one-to-one room" (v3)
+    And user "moderator" is participant of room "one-to-one room" (v4)
       | description |
       |             |
 
@@ -69,13 +69,13 @@ Feature: set-description
     And user "owner" promotes "moderator" in room "group room" with 200
     And user "owner" adds "invited user" to room "group room" with 200
     When user "owner" sets description for room "group room" to "the description" with 200
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "group room" (v3)
+    And user "moderator" is participant of room "group room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "group room" (v3)
+    And user "invited user" is participant of room "group room" (v4)
       | description     |
       | the description |
 
@@ -87,13 +87,13 @@ Feature: set-description
     And user "owner" promotes "moderator" in room "group room" with 200
     And user "owner" adds "invited user" to room "group room" with 200
     When user "moderator" sets description for room "group room" to "the description" with 200
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "group room" (v3)
+    And user "moderator" is participant of room "group room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "group room" (v3)
+    And user "invited user" is participant of room "group room" (v4)
       | description     |
       | the description |
 
@@ -109,13 +109,13 @@ Feature: set-description
     And user "not invited user" sets description for room "group room" to "not invited user description" with 404
     # Guest user names in tests must being with "guest"
     And user "guest not joined" sets description for room "group room" to "guest not joined description" with 404
-    Then user "owner" is participant of room "group room" (v3)
+    Then user "owner" is participant of room "group room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "group room" (v3)
+    And user "moderator" is participant of room "group room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "group room" (v3)
+    And user "invited user" is participant of room "group room" (v4)
       | description     |
       | the description |
 
@@ -133,22 +133,22 @@ Feature: set-description
     And user "owner" promotes "guest moderator" in room "public room" with 200
     And user "guest" joins room "public room" with 200
     When user "owner" sets description for room "public room" to "the description" with 200
-    Then user "owner" is participant of room "public room" (v3)
+    Then user "owner" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "public room" (v3)
+    And user "moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "public room" (v3)
+    And user "invited user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "not invited but joined user" is participant of room "public room" (v3)
+    And user "not invited but joined user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest moderator" is participant of room "public room" (v3)
+    And user "guest moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest" is participant of room "public room" (v3)
+    And user "guest" is participant of room "public room" (v4)
       | description     |
       | the description |
 
@@ -164,22 +164,22 @@ Feature: set-description
     And user "owner" promotes "guest moderator" in room "public room" with 200
     And user "guest" joins room "public room" with 200
     When user "moderator" sets description for room "public room" to "the description" with 200
-    Then user "owner" is participant of room "public room" (v3)
+    Then user "owner" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "public room" (v3)
+    And user "moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "public room" (v3)
+    And user "invited user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "not invited but joined user" is participant of room "public room" (v3)
+    And user "not invited but joined user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest moderator" is participant of room "public room" (v3)
+    And user "guest moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest" is participant of room "public room" (v3)
+    And user "guest" is participant of room "public room" (v4)
       | description     |
       | the description |
 
@@ -195,22 +195,22 @@ Feature: set-description
     And user "owner" promotes "guest moderator" in room "public room" with 200
     And user "guest" joins room "public room" with 200
     When user "guest moderator" sets description for room "public room" to "the description" with 200
-    Then user "owner" is participant of room "public room" (v3)
+    Then user "owner" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "public room" (v3)
+    And user "moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "public room" (v3)
+    And user "invited user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "not invited but joined user" is participant of room "public room" (v3)
+    And user "not invited but joined user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest moderator" is participant of room "public room" (v3)
+    And user "guest moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest" is participant of room "public room" (v3)
+    And user "guest" is participant of room "public room" (v4)
       | description     |
       | the description |
 
@@ -232,22 +232,22 @@ Feature: set-description
     And user "guest" sets description for room "public room" to "guest description" with 403
     # Guest user names in tests must being with "guest"
     And user "guest not joined" sets description for room "public room" to "guest not joined description" with 404
-    Then user "owner" is participant of room "public room" (v3)
+    Then user "owner" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "moderator" is participant of room "public room" (v3)
+    And user "moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "invited user" is participant of room "public room" (v3)
+    And user "invited user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "not invited but joined user" is participant of room "public room" (v3)
+    And user "not invited but joined user" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest moderator" is participant of room "public room" (v3)
+    And user "guest moderator" is participant of room "public room" (v4)
       | description     |
       | the description |
-    And user "guest" is participant of room "public room" (v3)
+    And user "guest" is participant of room "public room" (v4)
       | description     |
       | the description |
 
@@ -268,13 +268,13 @@ Feature: set-description
     When user "owner of file" sets description for room "file last share room" to "owner of file description" with 403
     And user "user with access to file" sets description for room "file last share room" to "user with access to file description" with 403
     And user "guest" sets description for room "file last share room" to "guest description" with 403
-    Then user "owner of file" is participant of room "file last share room" (v3)
+    Then user "owner of file" is participant of room "file last share room" (v4)
       | description |
       |             |
-    And user "user with access to file" is participant of room "file last share room" (v3)
+    And user "user with access to file" is participant of room "file last share room" (v4)
       | description |
       |             |
-    And user "guest" is participant of room "file last share room" (v3)
+    And user "guest" is participant of room "file last share room" (v4)
       | description |
       |             |
 
@@ -291,10 +291,10 @@ Feature: set-description
     And user "guest" joins room "password request for last share room" with 200
     And user "owner of file" joins room "password request for last share room" with 200
     When user "owner of file" sets description for room "password request for last share room" to "the description" with 200
-    Then user "owner of file" is participant of room "password request for last share room" (v3)
+    Then user "owner of file" is participant of room "password request for last share room" (v4)
       | description     |
       | the description |
-    And user "guest" is participant of room "password request for last share room" (v3)
+    And user "guest" is participant of room "password request for last share room" (v4)
       | description     |
       | the description |
 
diff --git a/tests/integration/features/sharing/hooks.feature b/tests/integration/features/sharing/hooks.feature
index 3e5261337..fab37c9e4 100644
--- a/tests/integration/features/sharing/hooks.feature
+++ b/tests/integration/features/sharing/hooks.feature
@@ -735,8 +735,8 @@ Feature: hooks
     And user "participant1" shares "welcome.txt" with room "own one-to-one room" with OCS 100
     When user "participant1" removes themselves from room "own one-to-one room" with 200
     When user "participant2" removes themselves from room "own one-to-one room" with 200
-    And user "participant1" is not participant of room "own one-to-one room"
-    And user "participant2" is not participant of room "own one-to-one room"
+    And user "participant1" is not participant of room "own one-to-one room" (v4)
+    And user "participant2" is not participant of room "own one-to-one room" (v4)
     Then user "participant1" gets last share
     And the OCS status code should be "404"
     And user "participant2" gets last share