diff --git a/pom.xml b/pom.xml
index b27af36..1619da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>org.junit</groupId>
+			    <artifactId>junit-bom</artifactId>
+			    <version>6.1.0-M1</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -104,31 +111,21 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>6.1.0-M1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>6.1.0-M1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-params</artifactId>
-			<version>6.1.0-M1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<version>6.1.0-M1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-runner</artifactId>
-			<version>1.14.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -143,12 +140,6 @@
 			<version>5.22.0</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>3.0</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
diff --git a/src/test/java/de/kreth/property2java/GeneratorTests.java b/src/test/java/de/kreth/property2java/GeneratorTests.java
index 8c50440..42da5d2 100644
--- a/src/test/java/de/kreth/property2java/GeneratorTests.java
+++ b/src/test/java/de/kreth/property2java/GeneratorTests.java
@@ -2,15 +2,17 @@ package de.kreth.property2java;
 
 import static de.kreth.property2java.TestPropertiesSource.testProperties;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,7 +23,6 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
@@ -31,9 +32,7 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
-
 import org.apache.commons.cli.MissingOptionException;
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -146,14 +145,10 @@ class GeneratorTests {
 		assertEquals(countCloseBaces, countOpenBaces,
 				"Count of Braces doesn't match. Open = " + countOpenBaces + ", Close = " + countCloseBaces);
 
-		assertNotNull(linePackage);
-		assertNotNull(lineClass);
-
-		assertThat(linePackage,
-				Matchers.stringContainsInOrder(Arrays.asList("package", "de.kreth.property2java", ";")));
-
-		assertThat(lineClass,
-				Matchers.stringContainsInOrder(Arrays.asList("public", "enum", "Application_Properties")));
+		assertThat(linePackage)
+			.isEqualToIgnoringWhitespace("package de.kreth.property2java;");
+		assertThat(lineClass)
+			.isEqualToIgnoringWhitespace("public enum Application_Properties {");
 
 	}
 
diff --git a/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java b/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java
index 5f5d6ec..8f03623 100644
--- a/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java
+++ b/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java
@@ -1,7 +1,7 @@
 package de.kreth.property2java;
 
 import static de.kreth.property2java.TestPropertiesSource.testProperties;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
@@ -20,8 +19,6 @@ import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
-
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -94,11 +91,10 @@ public class GeneratorWithInnerPropertiesTest {
 		assertNotNull(linePackage);
 		assertNotNull(lineClass);
 
-		assertThat(linePackage,
-				Matchers.stringContainsInOrder(Arrays.asList("package", "de.kreth.property2java", ";")));
-
-		assertThat(lineClass,
-				Matchers.stringContainsInOrder(Arrays.asList("public", "enum", "Application_Properties")));
+		assertThat(linePackage)
+			.containsIgnoringWhitespaces("package de.kreth.property2java;");
+		assertThat(lineClass)
+			.containsIgnoringWhitespaces("public enum Application_Properties {");
 
 	}
 
@@ -132,11 +128,11 @@ public class GeneratorWithInnerPropertiesTest {
 		assertNotNull(declaration);
 		assertNotNull(load);
 
-		assertThat(declaration,
-				Matchers.stringContainsInOrder(Arrays.asList("private", "static", "Properties", "properties", "=", "new Properties()", ";")));
-
-		assertThat(load,
-				Matchers.containsString("properties.load(Application_Properties.class.getResourceAsStream(\"/application.properties\"));"));
+//		assertThat(declaration,
+//				Matchers.stringContainsInOrder(Arrays.asList("private", "static", "Properties", "properties", "=", "new Properties()", ";")));
+//
+//		assertThat(load,
+//				Matchers.containsString("properties.load(Application_Properties.class.getResourceAsStream(\"/application.properties\"));"));
 
 	}