diff --git a/maxkey-persistence/src/test/resources/application.properties b/maxkey-persistence/src/test/resources/application.properties
index 9f06ac1e0..502977fef 100644
--- a/maxkey-persistence/src/test/resources/application.properties
+++ b/maxkey-persistence/src/test/resources/application.properties
@@ -25,8 +25,8 @@ spring.servlet.multipart.max-file-size=4194304
 #datasource
 spring.datasource.username=root
 spring.datasource.password=maxkey
-spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8&serverTimezone=UTC
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #mybatis
 mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
diff --git a/maxkey-persistence/src/test/resources/spring/applicationContext-database.xml b/maxkey-persistence/src/test/resources/spring/applicationContext-database.xml
deleted file mode 100644
index 715495d3b..000000000
--- a/maxkey-persistence/src/test/resources/spring/applicationContext-database.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans 	xmlns="http://www.springframework.org/schema/beans"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-		xmlns:aop="http://www.springframework.org/schema/aop"
-		xmlns:tx="http://www.springframework.org/schema/tx" 
-		xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-		xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="
-	     http://www.springframework.org/schema/context 
-	     http://www.springframework.org/schema/context/spring-context.xsd
-	     http://www.springframework.org/schema/beans 
-	     http://www.springframework.org/schema/beans/spring-beans.xsd
-	     http://www.springframework.org/schema/jdbc 
-	     http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-	     http://www.springframework.org/schema/tx 
-	     http://www.springframework.org/schema/tx/spring-tx.xsd
-	     http://www.springframework.org/schema/aop 
-	     http://www.springframework.org/schema/aop/spring-aop.xsd">
-
-	<!-- dataSource define begin -->
-	<!-- dataSource configuration -->
-	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource"  destroy-method="close" >      
-	   <!--  <property name="driverClass" value="#{dataSoruceConfig.driverClass}"/>     -->  
-	    <property name="url" value="${spring.datasource.url}"/>      
-	    <property name="username" value="${spring.datasource.username}"/>      
-	    <property name="password" value="${spring.datasource.password}"/>       
-	</bean> 
-
-</beans>
\ No newline at end of file
diff --git a/maxkey-persistence/src/test/resources/spring/applicationContext.xml b/maxkey-persistence/src/test/resources/spring/applicationContext.xml
index 32a72fffd..3dbc04a49 100644
--- a/maxkey-persistence/src/test/resources/spring/applicationContext.xml
+++ b/maxkey-persistence/src/test/resources/spring/applicationContext.xml
@@ -17,9 +17,15 @@
 	        http://www.springframework.org/schema/util/spring-util.xsd
 	        http://www.springframework.org/schema/mvc 
 	        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
- 	<!-- 
- 	<import resource="applicationContext-task.xml"/>
- 	-->
+ 	<!-- dataSource define begin -->
+	<!-- dataSource configuration -->
+	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource"  destroy-method="close" >      
+	   <!--  <property name="driverClass" value="#{dataSoruceConfig.driverClass}"/>     -->  
+	    <property name="url" value="${spring.datasource.url}"/>      
+	    <property name="username" value="${spring.datasource.username}"/>      
+	    <property name="password" value="${spring.datasource.password}"/>       
+	</bean> 
+	
  	<!-- Application properties configs  -->
 	<bean id="propertySourcesPlaceholderConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
 	  <property name="locations">
@@ -36,7 +42,6 @@
 	<bean id="passwordReciprocal" class="org.maxkey.crypto.password.PasswordReciprocal"></bean>
 	
  	<!-- Datastore configuration  -->
- 	<import resource="applicationContext-database.xml"/>
  	<import resource="applicationContext-persist.xml"/>
  
  	<bean id="kafkaProvisioningService" class="org.maxkey.identity.kafka.KafkaProvisioningService"></bean>
diff --git a/maxkey-web-maxkey/src/test/java/com/connsec/web/authentication/kerberos/KerberosPrincipal.java b/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java
similarity index 97%
rename from maxkey-web-maxkey/src/test/java/com/connsec/web/authentication/kerberos/KerberosPrincipal.java
rename to maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java
index 19f7939ba..bf4931a0f 100644
--- a/maxkey-web-maxkey/src/test/java/com/connsec/web/authentication/kerberos/KerberosPrincipal.java
+++ b/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java
@@ -18,7 +18,7 @@
 /**
  * 
  */
-package com.connsec.web.authentication.kerberos;
+package org.maxkey.web.authentication.kerberos;
 
 import java.util.Date;
 import java.util.regex.Pattern;