diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
index d41622675ee3343f0df2c58109ca7067ed30ad54..a129a4c389de52dbf8d0ef358efdec8ea5e6771c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
@@ -184,7 +184,7 @@ class CommandServiceTest {
 		void shouldCallIsVorgangLocked() {
 			service.validateVorgang(VorgangTestFactory.ID);
 
-			verify(vorgangService).isVorgangLocked(anyString());
+			verify(vorgangService).isVorgangLocked(VorgangTestFactory.ID);
 		}
 
 		@Test
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java
index 77b612728e819905892d7d5a228b955957263732..7b4905e5280cf65dc77a65dae4888feb035e7f01 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/LockTestFactory.java
@@ -27,12 +27,14 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
+import com.thedeanda.lorem.LoremIpsum;
+
 import de.ozgcloud.vorgang.vorgang.Lock.LockBuilder;
 
 public class LockTestFactory {
 
-	public static final String CLIENT_NAME = "clientName";
-	public static final String REASON = "reason";
+	public static final String CLIENT_NAME = LoremIpsum.getInstance().getFirstName() + "-Client";
+	public static final String REASON = LoremIpsum.getInstance().getWords(5);
 	public static final String LOCKED_SINCE_STR = ZonedDateTime.now().withNano(0).format(DateTimeFormatter.ISO_INSTANT);
 	public static final ZonedDateTime LOCKED_SINCE = ZonedDateTime.parse(LOCKED_SINCE_STR);
 
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java
index 95d602135383fdb2b3b5b777cf145a0ed4cd7922..d57886aa60ea449c2003ecdbdf979614a259dc89 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerTest.java
@@ -235,7 +235,7 @@ class VorgangEventListenerTest {
 	}
 
 	@Nested
-	class TestLockVorgang {
+	class TestOnLockVorgang {
 
 		@Captor
 		private ArgumentCaptor<CommandFailedEvent> eventCaptor;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
index 0fc449d696773dd893a4c8fc3bc52ad577a5c498..5e4c2e4690780c92555b58237d9662f6dafe91c8 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceTest.java
@@ -586,10 +586,10 @@ class VorgangServiceTest {
 	@Nested
 	class TestBuildLockPatch {
 
+		 private final Command command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
+
 		@Test
 		void shouldSetClientName() {
-			var command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
-
 			var result = service.buildLockPatch(command);
 
 			assertThat(result).extractingByKey(VorgangService.KEY_HEADER_LOCK, MAP)
@@ -598,8 +598,6 @@ class VorgangServiceTest {
 
 		@Test
 		void shouldSetLockedSince() {
-			var command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
-
 			var result = service.buildLockPatch(command);
 
 			assertThat(result).extractingByKey(VorgangService.KEY_HEADER_LOCK, MAP)
@@ -609,8 +607,6 @@ class VorgangServiceTest {
 
 		@Test
 		void shouldSetReason() {
-			var command = CommandTestFactory.createBuilder().bodyObject(Map.of(Lock.FIELD_REASON, LockTestFactory.REASON)).build();
-
 			var result = service.buildLockPatch(command);
 
 			assertThat(result).extractingByKey(VorgangService.KEY_HEADER_LOCK, MAP).containsEntry(Lock.FIELD_REASON, LockTestFactory.REASON);