diff --git a/build.gradle b/build.gradle
index 39c61aa2..96fbccd3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,8 @@ wrapper {
     gradleVersion = '8.5'
 }
 
-// FIXME: Mockito is currently self-attaching to enable the inline-mock-maker. This will no longer work in future releases of the JDK. Please add Mockito as an agent to your build what is described in Mockito's documentation: https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Mockito.html#0.3
+// TODO.impl: self-attaching is deprecated, see:
+//  https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Mockito.html#0.3
 
 configurations {
     compileOnly {
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
index 7b79bc15..fcc900f1 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
@@ -142,6 +142,7 @@ public class HsOfficeCoopSharesTransactionEntity implements Stringifyable, BaseE
                         directlyFetchedByDependsOnColumn(),
                         NOT_NULL)
 
+                // the membership:ADMIN is not to be confused with the member itself, it's an account manager of the coop
                 .toRole("membership", ADMIN).grantPermission(INSERT)
                 .toRole("membership", ADMIN).grantPermission(UPDATE)
                 .toRole("membership", AGENT).grantPermission(SELECT);
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java
index 61ce652b..edf5d0a6 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java
@@ -169,7 +169,7 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
         if (entity.getValidity().hasUpperBound()) {
             resource.setValidTo(entity.getValidity().upper().minusDays(1));
         }
-        resource.getPartner().setPartnerNumber(entity.getPartner().getTaggedPartnerNumber()); // FIXME: use partner mapper?
+        resource.getPartner().setPartnerNumber(entity.getPartner().getTaggedPartnerNumber()); // TODO.refa: use partner mapper?
     };
 
     final BiConsumer<HsOfficeMembershipInsertResource, HsOfficeMembershipEntity> SEPA_MANDATE_RESOURCE_TO_ENTITY_POSTMAPPER = (resource, entity) -> {
diff --git a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql
index e7229595..5dd06009 100644
--- a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5118-hs-office-coopshares-test-data.sql
@@ -43,7 +43,10 @@ end; $$;
 
 do language plpgsql $$
     begin
-        call base.defineContext('creating coopSharesTransaction test-data');
+        call base.defineContext('creating coopSharesTransaction test-data',
+                                null,
+                                'superuser-alex@hostsharing.net',
+                                'rbac.global#global:ADMIN');
         SET CONSTRAINTS ALL DEFERRED;
 
         call hs_office.coopsharetx_create_test_data(10001, '01');
diff --git a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql
index ce94ddfc..2ce3186b 100644
--- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql
+++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5128-hs-office-coopassets-test-data.sql
@@ -49,7 +49,10 @@ end; $$;
 
 do language plpgsql $$
     begin
-        call base.defineContext('creating coopAssetsTransaction test-data');
+        call base.defineContext('creating coopAssetsTransaction test-data',
+                                null,
+                                'superuser-alex@hostsharing.net',
+                                'rbac.global#global:ADMIN');
         SET CONSTRAINTS ALL DEFERRED;
 
         call hs_office.coopassettx_create_test_data(10001, '01');