diff --git a/pom.xml b/pom.xml
index f5086bf33e7d3907e7c99e34547e58b855c22099..2eedc3b34b128ce7a269b8ff82f5f49f22cba7a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,11 @@
 			<version>${mapstruct.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.thedeanda</groupId>
+			<artifactId>lorem</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- Test -->
 		<dependency>
@@ -162,11 +167,6 @@
 			<artifactId>quarkus-panache-mock</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.github.javafaker</groupId>
-			<artifactId>javafaker</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>io.rest-assured</groupId>
 			<artifactId>rest-assured</artifactId>
@@ -177,8 +177,6 @@
 			<artifactId>assertj-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
-		<!-- Mockito -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-junit-jupiter</artifactId>
diff --git a/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java b/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java
index 9f95fd80c0591d15be7066d2904f88dea6f35c1b..7cf0e921d65abccb661e761c2e569867ddafee87 100644
--- a/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java
+++ b/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java
@@ -6,23 +6,43 @@ import java.util.Map;
 
 import org.keycloak.representations.idm.UserRepresentation;
 
-import com.github.javafaker.Faker;
+import com.thedeanda.lorem.LoremIpsum;
 
 public class UserRepresentationTestFactory {
-	static final String EMAIL = Faker.instance().internet().emailAddress();
-	static final String FIRST_NAME = Faker.instance().name().firstName();
-	static final String LAST_NAME = Faker.instance().name().lastName();
-	static final String USER_NAME = Faker.instance().buffy().characters();
+
+	static final String EMAIL = LoremIpsum.getInstance().getEmail();
+	static final String FIRST_NAME = LoremIpsum.getInstance().getFirstName();
+	static final String LAST_NAME = LoremIpsum.getInstance().getLastName();
+	static final String USER_NAME = LoremIpsum.getInstance().getName();
+
 	static final String EXTERNAL_ID = "external-id-1-ldap";
 	static final String EXTERNAL_ID_FALLBACK = "external-id-2-keykloak";
-	static final String ROLE = "role";
-	static final long CREATED = Instant.now().toEpochMilli();
+	static final String ROLE = "VERWALTUNG_USER";
+
+	private static final long CREATED = Instant.now().toEpochMilli();
+
 	static final String ORGANSISATIONS_EINHEIT_ID = "0815";
-	static final Map<String, List<String>> ATTRIBUTES = Map.of("LDAP_ID", List.of(EXTERNAL_ID), "organisationseinheitId",
-			List.of(ORGANSISATIONS_EINHEIT_ID));
+
+	private static final String LDAP_ID_KEY = "LDAP_ID";
+	private static final String ORGANISATIONS_EINHEIT_ID_KEY = "organisationseinheitId";
+
+	// CHECKME: Wie verhaelt es sich, wenn nur ein Wert kommt?
+	static final Map<String, List<String>> ATTRIBUTES = Map.of(
+			LDAP_ID_KEY, List.of(EXTERNAL_ID),
+			ORGANISATIONS_EINHEIT_ID_KEY, List.of(ORGANSISATIONS_EINHEIT_ID));
+
+	private static final String CLIENT_KEY = "sh-kiel-dev-goofy";
+	private static final Map<String, List<String>> CLIENT_ROLED = Map.of(CLIENT_KEY, List.of(ROLE));
+
+	static UserRepresentation createWithAttributes(Map<String, List<String>> attributes) {
+		var user = create();
+		user.setAttributes(attributes);
+
+		return user;
+	}
 
 	public static UserRepresentation create() {
-		UserRepresentation user = new UserRepresentation();
+		var user = new UserRepresentation();
 		user.setEmail(EMAIL);
 		user.setFirstName(FIRST_NAME);
 		user.setLastName(LAST_NAME);
@@ -30,16 +50,8 @@ public class UserRepresentationTestFactory {
 		user.setCreatedTimestamp(CREATED);
 		user.setId(EXTERNAL_ID_FALLBACK);
 		user.setAttributes(ATTRIBUTES);
+		user.setClientRoles(CLIENT_ROLED);
 
-		List<String> clientRoles = List.of(ROLE);
-		user.setRealmRoles(clientRoles);
-
-		return user;
-	}
-
-	static UserRepresentation createWithAttributes(Map<String, List<String>> attributes) {
-		var user = create();
-		user.setAttributes(attributes);
 		return user;
 	}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java b/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java
index 3d83520fb36d1588a28a067c63e4a527e77c6df3..36d9ac59617a40034f4d0fdf026b826c53849874 100644
--- a/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java
+++ b/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java
@@ -5,14 +5,14 @@ import java.util.Map;
 
 import org.keycloak.admin.client.resource.UserResource;
 
-class UserResourceTestFactory {
+public class UserResourceTestFactory {
 
-	static UserResource create() {
+	public static UserResource create() {
 
 		return new StubUserResource();
 	}
 
-	static UserResource createWithAttributes(Map<String, List<String>> attributes) {
+	public static UserResource createWithAttributes(Map<String, List<String>> attributes) {
 		return new StubUserResource(attributes);
 	}
 }
diff --git a/src/test/java/de/itvsh/kop/user/UserTestFactory.java b/src/test/java/de/itvsh/kop/user/UserTestFactory.java
index b05f5a2a31e239d79a0558f7f04c5d583209ddca..21899053598cf2328fef335e27e622169947a351 100644
--- a/src/test/java/de/itvsh/kop/user/UserTestFactory.java
+++ b/src/test/java/de/itvsh/kop/user/UserTestFactory.java
@@ -3,14 +3,15 @@ package de.itvsh.kop.user;
 import java.util.List;
 import java.util.UUID;
 
-import com.github.javafaker.Faker;
+import com.thedeanda.lorem.LoremIpsum;
 
 public class UserTestFactory {
-	public static final String FIRST_NAME = Faker.instance().name().firstName();
-	public static final String LAST_NAME = Faker.instance().name().lastName();
-	public static final String USER_NAME = Faker.instance().name().username();
+
+	public static final String FIRST_NAME = LoremIpsum.getInstance().getFirstName();
+	public static final String LAST_NAME = LoremIpsum.getInstance().getLastName();
+	public static final String USER_NAME = LoremIpsum.getInstance().getName();
 	public static final long LAST_SYNC_TIMESTAMP = 1001L;
-	public static final String EMAIL = Faker.instance().internet().emailAddress();
+	public static final String EMAIL = LoremIpsum.getInstance().getEmail();
 	public static final String EXTERNAL_ID = UUID.randomUUID().toString();
 	public static final List<String> ORGANISTATIONSEINHEITEN_IDS = List.of("0815", "4711");
 	public static final List<String> ROLES = List.of("ROLE_1", "POSTSTELLE");