diff --git a/backend/src/main/resources/db/changelog/changes/031-add-performed-at-index-to-stock-movements.xml b/backend/src/main/resources/db/changelog/changes/031-add-performed-at-index-to-stock-movements.xml
deleted file mode 100644
index 873b799..0000000
--- a/backend/src/main/resources/db/changelog/changes/031-add-performed-at-index-to-stock-movements.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
-
-    <changeSet id="031-add-performed-at-index-to-stock-movements" author="effigenix">
-        <createIndex indexName="idx_stock_movements_performed_at" tableName="stock_movements">
-            <column name="performed_at"/>
-        </createIndex>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/backend/src/main/resources/db/changelog/db.changelog-master.xml b/backend/src/main/resources/db/changelog/db.changelog-master.xml
index d8543f4..328975b 100644
--- a/backend/src/main/resources/db/changelog/db.changelog-master.xml
+++ b/backend/src/main/resources/db/changelog/db.changelog-master.xml
@@ -35,7 +35,7 @@
     <include file="db/changelog/changes/028-create-stock-movements-table.xml"/>
     <include file="db/changelog/changes/029-seed-stock-movement-permissions.xml"/>
     <include file="db/changelog/changes/030-add-batch-id-index-to-stock-movements.xml"/>
-    <include file="db/changelog/changes/031-add-performed-at-index-to-stock-movements.xml"/>
+
     <include file="db/changelog/changes/032-add-batch-id-to-production-orders.xml"/>
 
 </databaseChangeLog>
diff --git a/backend/src/test/java/de/effigenix/infrastructure/inventory/web/StockMovementControllerIntegrationTest.java b/backend/src/test/java/de/effigenix/infrastructure/inventory/web/StockMovementControllerIntegrationTest.java
index 82c6c6d..f80c177 100644
--- a/backend/src/test/java/de/effigenix/infrastructure/inventory/web/StockMovementControllerIntegrationTest.java
+++ b/backend/src/test/java/de/effigenix/infrastructure/inventory/web/StockMovementControllerIntegrationTest.java
@@ -5,8 +5,6 @@ import de.effigenix.infrastructure.AbstractIntegrationTest;
 import de.effigenix.infrastructure.inventory.web.dto.AddStockBatchRequest;
 import de.effigenix.infrastructure.inventory.web.dto.CreateStockRequest;
 import de.effigenix.infrastructure.inventory.web.dto.RecordStockMovementRequest;
-import de.effigenix.infrastructure.usermanagement.persistence.entity.RoleEntity;
-import de.effigenix.infrastructure.usermanagement.persistence.entity.UserEntity;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -33,18 +31,18 @@ class StockMovementControllerIntegrationTest extends AbstractIntegrationTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        RoleEntity adminRole = createRole(RoleName.ADMIN, "Admin");
-        RoleEntity viewerRole = createRole(RoleName.PRODUCTION_WORKER, "Viewer");
+        String adminRoleId = createRole(RoleName.ADMIN, "Admin");
+        String viewerRoleId = createRole(RoleName.PRODUCTION_WORKER, "Viewer");
 
-        UserEntity admin = createUser("movement.admin", "movement.admin@test.com", Set.of(adminRole), "BRANCH-01");
-        UserEntity viewer = createUser("movement.viewer", "movement.viewer@test.com", Set.of(viewerRole), "BRANCH-01");
+        String adminId = createUser("movement.admin", "movement.admin@test.com", Set.of(adminRoleId), "BRANCH-01");
+        String viewerId = createUser("movement.viewer", "movement.viewer@test.com", Set.of(viewerRoleId), "BRANCH-01");
 
-        adminToken = generateToken(admin.getId(), "movement.admin",
+        adminToken = generateToken(adminId, "movement.admin",
                 "STOCK_WRITE,STOCK_READ,STOCK_MOVEMENT_WRITE,STOCK_MOVEMENT_READ");
-        viewerToken = generateToken(viewer.getId(), "movement.viewer", "USER_READ");
+        viewerToken = generateToken(viewerId, "movement.viewer", "USER_READ");
 
         storageLocationId = createStorageLocation();
-        articleId = UUID.randomUUID().toString();
+        articleId = createArticleId();
         stockId = createStock(articleId);
         stockBatchId = addBatchToStock(stockId);
     }