diff --git a/src/test/java/com/projectswg/holocore/services/gameplay/combat/CloningTest.kt b/src/test/java/com/projectswg/holocore/services/gameplay/combat/CloningTest.kt
index 06fa87bd6..1db4b7333 100644
--- a/src/test/java/com/projectswg/holocore/services/gameplay/combat/CloningTest.kt
+++ b/src/test/java/com/projectswg/holocore/services/gameplay/combat/CloningTest.kt
@@ -1,11 +1,10 @@
 /***********************************************************************************
  * Copyright (c) 2024 /// Project SWG /// www.projectswg.com                       *
  *                                                                                 *
- * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on          *
+ * ProjectSWG is an emulation project for Star Wars Galaxies founded on            *
  * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
- * Our goal is to create an emulator which will provide a server for players to    *
- * continue playing a game similar to the one they used to play. We are basing     *
- * it on the final publish of the game prior to end-game events.                   *
+ * Our goal is to create one or more emulators which will provide servers for      *
+ * players to continue playing a game similar to the one they used to play.        *
  *                                                                                 *
  * This file is part of Holocore.                                                  *
  *                                                                                 *
@@ -48,9 +47,9 @@ class CloningTest : AcceptanceTest() {
 
 	@Test
 	fun `possible to clone after being deathblown`() {
-		addUser("username", "password", AccessLevel.DEV)
-		val character1 = HeadlessSWGClient.createZonedInCharacter("username", "password", "charone")
-		val character2 = HeadlessSWGClient.createZonedInCharacter("username", "password", "chartwo")
+		val user = generateUser(AccessLevel.DEV)
+		val character1 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "charone")
+		val character2 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "chartwo")
 		character1.duel(character2.player.creatureObject)
 		character2.duel(character1.player.creatureObject)
 		character1.adminKill(character2.player.creatureObject)
diff --git a/src/test/java/com/projectswg/holocore/services/support/KillAdminCommandTest.kt b/src/test/java/com/projectswg/holocore/services/support/KillAdminCommandTest.kt
index 762b51497..bab1db8b9 100644
--- a/src/test/java/com/projectswg/holocore/services/support/KillAdminCommandTest.kt
+++ b/src/test/java/com/projectswg/holocore/services/support/KillAdminCommandTest.kt
@@ -1,11 +1,10 @@
 /***********************************************************************************
  * Copyright (c) 2024 /// Project SWG /// www.projectswg.com                       *
  *                                                                                 *
- * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on          *
+ * ProjectSWG is an emulation project for Star Wars Galaxies founded on            *
  * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
- * Our goal is to create an emulator which will provide a server for players to    *
- * continue playing a game similar to the one they used to play. We are basing     *
- * it on the final publish of the game prior to end-game events.                   *
+ * Our goal is to create one or more emulators which will provide servers for      *
+ * players to continue playing a game similar to the one they used to play.        *
  *                                                                                 *
  * This file is part of Holocore.                                                  *
  *                                                                                 *
@@ -74,9 +73,9 @@ class KillAdminCommandTest : AcceptanceTest() {
 
 	@Test
 	fun killPlayer() {
-		addUser("username", "password", AccessLevel.DEV)
-		val character1 = HeadlessSWGClient.createZonedInCharacter("username", "password", "charone")
-		val character2 = HeadlessSWGClient.createZonedInCharacter("username", "password", "chartwo")
+		val user = generateUser(AccessLevel.DEV)
+		val character1 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "charone")
+		val character2 = HeadlessSWGClient.createZonedInCharacter(user.username, user.password, "chartwo")
 
 		character1.adminKill(character2.player.creatureObject)