diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java
index 4c21de8ba..e186094f4 100644
--- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java
+++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java
@@ -18,18 +18,12 @@
 package org.apache.mybatis.jpa.test;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-
 import org.apache.mybatis.jpa.util.WebContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.maxkey.domain.Accounts;
-import org.maxkey.domain.apps.AppsFormBasedDetails;
 import org.maxkey.persistence.service.AccountsService;
-import org.maxkey.persistence.service.AppsFormBasedDetailsService;
-import org.maxkey.util.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java
index ac515a63f..5bfb6955c 100644
--- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java
+++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java
@@ -18,20 +18,12 @@
 package org.apache.mybatis.jpa.test;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-
 import org.apache.mybatis.jpa.util.WebContext;
 import org.junit.Before;
 import org.junit.Test;
-import org.maxkey.domain.Accounts;
 import org.maxkey.domain.apps.Apps;
-import org.maxkey.domain.apps.AppsFormBasedDetails;
-import org.maxkey.persistence.service.AccountsService;
-import org.maxkey.persistence.service.AppsFormBasedDetailsService;
 import org.maxkey.persistence.service.AppsService;
-import org.maxkey.util.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java
index 4469e380f..c060dd520 100644
--- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java
+++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.maxkey.domain.apps.AppsFormBasedDetails;
 import org.maxkey.persistence.service.AppsFormBasedDetailsService;
-import org.maxkey.util.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
diff --git a/maxkey-persistence/src/test/resources/spring/applicationContext.xml b/maxkey-persistence/src/test/resources/spring/applicationContext.xml
index 8813a3b27..6a26045d7 100644
--- a/maxkey-persistence/src/test/resources/spring/applicationContext.xml
+++ b/maxkey-persistence/src/test/resources/spring/applicationContext.xml
@@ -44,7 +44,7 @@
  	<!-- Datastore configuration  -->
  	<import resource="applicationContext-persist.xml"/>
  
- 	<bean id="kafkaProvisioningService" class="org.maxkey.identity.kafka.KafkaProvisioningService"></bean>
+ 	<bean id="kafkaPersistService" class="org.maxkey.persistence.kafka.KafkaPersistService"></bean>
 	
 	<bean id="applicationConfig" class="org.maxkey.configuration.ApplicationConfig"></bean>