diff --git a/agent/src/test/resources/emptytest/config/PrivilegeConfig.xml b/agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
+++ b/agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml b/agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
+++ b/agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/agent/src/test/resources/realmtest/config/PrivilegeConfig.xml b/agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
+++ b/agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/agent/src/test/resources/transienttest/config/PrivilegeConfig.xml b/agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
+++ b/agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml b/agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
+++ b/agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
index 5cc637ba8..b2a9b4bf6 100644
--- a/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
+++ b/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
@@ -1,45 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
-		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
-		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege"/>
-		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
-		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
+		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
+		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
+		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
+		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
+++ b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
+++ b/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
+++ b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
+++ b/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml b/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
+++ b/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml b/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
+++ b/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/service/src/test/resources/executiontest/config/PrivilegeConfig.xml b/service/src/test/resources/executiontest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/service/src/test/resources/executiontest/config/PrivilegeConfig.xml
+++ b/service/src/test/resources/executiontest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/service/src/test/resources/migrationstest/config/PrivilegeConfig.xml b/service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
+++ b/service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/service/src/test/resources/reporttest/config/PrivilegeConfig.xml b/service/src/test/resources/reporttest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/service/src/test/resources/reporttest/config/PrivilegeConfig.xml
+++ b/service/src/test/resources/reporttest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/service/src/test/resources/svctest/config/PrivilegeConfig.xml b/service/src/test/resources/svctest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/service/src/test/resources/svctest/config/PrivilegeConfig.xml
+++ b/service/src/test/resources/svctest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/service/src/test/resources/transienttest/config/PrivilegeConfig.xml b/service/src/test/resources/transienttest/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/service/src/test/resources/transienttest/config/PrivilegeConfig.xml
+++ b/service/src/test/resources/transienttest/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml b/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
+++ b/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/test-performance/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml b/test-performance/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
index a67d6c0a7..b2a9b4bf6 100644
--- a/test-performance/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
+++ b/test-performance/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
@@ -1,45 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
-			<Parameter name="autoPersistOnPasswordChange" value="true" />
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
+			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
-		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
-		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege"/>
-		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
-		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
+		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
+		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
+		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
+		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file
diff --git a/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml b/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
index 0b193071f..b2a9b4bf6 100644
--- a/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
+++ b/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
-
 	<Container>
-
 		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="58d27145-5d1a-48ea-9e1c-f5a522f6a19f"/>
-			<Parameter name="secretSalt" value="25bd8911-0008-464f-82b8-4c5200db8dd7"/>
+			<Parameter name="secretKey" value="CHANGE-ME"/>
+			<Parameter name="secretSalt" value="CHANGE-ME"/>
 			<Parameter name="autoPersistOnUserChangesData" value="true" />
 		</Parameters>
-
 		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
 			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
 				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
 				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
 				<Parameter name="hashKeyLength" value="256" />
 			</Parameters>
 		</EncryptionHandler>
-
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
-
+		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler"/>
+		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler"/>
 	</Container>
-
 	<Policies>
 		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
 		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
@@ -41,5 +23,4 @@
 		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
 		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
 	</Policies>
-
 </Privilege>
\ No newline at end of file