diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
index 9d2a1b6e..04487ce6 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
@@ -19,8 +19,8 @@ public class CreateSelfDebitorForPartner extends UseCase<CreateSelfDebitorForPar
                 httpGet("/api/hs/office/relations?relationType=PARTNER&personData=" + uriEncoded("%{partnerPersonTradeName}"))
                         .expecting(OK).expecting(JSON),
                 response -> response.expectArrayElements(1).getFromBody("[0].holder.uuid"),
-            "From that output above, we're taking the UUID of the holder of the first result element.",
-            "**HINT**: With production data, you might get multiple results and have to decide which is the right one."
+                "In production data this query could result in multiple outputs. In that case, you have to find out which is the right one.",
+                "**HINT**: With production data, you might get multiple results and have to decide which is the right one."
         );
 
         keep("BankAccount: Test AG - refund bank account", () ->
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
index 2c06d308..6ed11f61 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
@@ -21,7 +21,8 @@ public class AddOperationsContactToPartner extends UseCase<AddOperationsContactT
         keep("Person: %{partnerPersonTradeName}", () ->
                         httpGet("/api/hs/office/persons?name=" + uriEncoded("%{partnerPersonTradeName}"))
                                 .expecting(OK).expecting(JSON),
-                response -> response.expectArrayElements(1).getFromBody("[0].uuid")
+                response -> response.expectArrayElements(1).getFromBody("[0].uuid"),
+                "In production data this query could result in multiple outputs. In that case, you have to find out which is the right one."
         );
 
         keep("Person: %{operationsContactGivenName} %{operationsContactFamilyName}",
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
index 625639f4..035bb3fb 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
@@ -21,7 +21,8 @@ public class AddRepresentativeToPartner extends UseCase<AddRepresentativeToPartn
         keep("Person: %{partnerPersonTradeName}", () ->
                         httpGet("/api/hs/office/persons?name=" + uriEncoded("%{partnerPersonTradeName}"))
                                 .expecting(OK).expecting(JSON),
-                response -> response.expectArrayElements(1).getFromBody("[0].uuid")
+                response -> response.expectArrayElements(1).getFromBody("[0].uuid"),
+                "In production data this query could result in multiple outputs. In that case, you have to find out which is the right one."
         );
 
         keep("Person: %{representativeGivenName} %{representativeFamilyName}", () ->
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
index ec396cf3..3cbb82cc 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
@@ -24,7 +24,8 @@ public class CreatePartner extends UseCase<CreatePartner> {
         keep("Person: Hostsharing eG", () ->
             httpGet("/api/hs/office/persons?name=Hostsharing+eG")
                     .expecting(OK).expecting(JSON),
-                    response -> response.expectArrayElements(1).getFromBody("[0].uuid")
+                    response -> response.expectArrayElements(1).getFromBody("[0].uuid"),
+                "Even in production data we expect this query to return just a single result." // TODO.impl: add constraint?
         );
 
         keep("Person: %{tradeName}", () ->