diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml
index 91dfa7fcebee91c9cfd68fee280e647929135d38..691a9b896d02ab275acdd4d70cf6ca3718af1403 100644
--- a/goofy-server/pom.xml
+++ b/goofy-server/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>goofy-server</artifactId>
-	<name>goofy server</name>
+	<name>Goofy Server</name>
 	<description>Projekt packaging deployment artefact</description>
 	<packaging>jar</packaging>
 
@@ -77,10 +77,20 @@
 
 	<build>
 		<plugins>
+		
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			 
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -103,30 +113,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<mainClass>de.itvsh.goofy.GoofyServerApplication</mainClass>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/EnvironmentControllerITCase.java b/goofy-server/src/test/java/de/itvsh/goofy/EnvironmentControllerITCase.java
index 0547afec30338f5bd67b065dd0a9e3edb57c51d6..91fb4e9d7f2d0f83cb52e053fca806b8f0511918 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/EnvironmentControllerITCase.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/EnvironmentControllerITCase.java
@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @AutoConfigureMockMvc
-class EnvironmentControllerITCase {
+class EnvironmentControllerTest {
 
 	@Autowired
 	private MockMvc mockMvc;
@@ -24,7 +24,7 @@ class EnvironmentControllerITCase {
 
 	@Test
 	void shouldHaveProductionFalse() throws Exception {
-		mockMvc.perform(get("/api/environment"))//
+		mockMvc.perform(get("/api/environment")).andExpect(status().is2xxSuccessful())//
 				.andExpect(jsonPath("$.production").value(false));
 	}
 }
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/RootControllerITCase.java b/goofy-server/src/test/java/de/itvsh/goofy/RootControllerITCase.java
index d55d2a263ba2ee0ba2f84f72b321ca32db90e4cd..3ec85899743402b53f019210e3541e1946a9a67b 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/RootControllerITCase.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/RootControllerITCase.java
@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @AutoConfigureMockMvc
-class RootControllerITCase {
+class RootControllerTest {
 	
 	private final String PATH = "/api";
 
diff --git a/goofy-service/pom.xml b/goofy-service/pom.xml
deleted file mode 100644
index c5be99fcee6f12e2bd49d83fb4a06d4107da90b9..0000000000000000000000000000000000000000
--- a/goofy-service/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
-	<parent>
-		<groupId>de.itvsh.ozg</groupId>
-		<artifactId>goofy</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>goofy-service</artifactId>
-	<name>goofy-service</name>
-	<description>Goofy Service</description>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e0edacabcfe1a8be767a3abf11d2b26996dae73c..fdea96e0b84178e734391b31a4d760f7e076a425 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,13 +18,15 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>15</java.version>
-		
+
 		<!-- TODO use 2.4.0.RELEASE -->
 		<spring.boot.version>2.3.6.RELEASE</spring.boot.version>
-		
+
 		<!-- plugins -->
 		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
 		<resources.plugin.version>3.1.0</resources.plugin.version>
+		<maven.surefire.version>3.0.0-M5</maven.surefire.version>
+		<maven.failsafe.version>3.0.0-M5</maven.failsafe.version>
 	</properties>
 
 	<dependencyManagement>
@@ -72,8 +74,15 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
 					<version>${spring.boot.version}</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>repackage</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
-					<plugin>
+				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>${maven-jar-plugin.version}</version>
@@ -81,17 +90,18 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.1</version>
+					<version>${maven.surefire.version}</version>
 					<configuration>
 						<argLine>
 							--illegal-access=permit
 						</argLine>
 					</configuration>
 				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>2.22.2</version>
+					<version>${maven.failsafe.version}</version>
 					<configuration>
 						<argLine>
 							--illegal-access=permit