diff --git a/src/test/java/de/tlc4b/tlc/integration/BasicTest.java b/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
index 23d6a18919a77e3f31b57ab6a5d166166ad85294..556c0ec0984473b8dd8eaa0e486af13bfa7b2b3c 100644
--- a/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
@@ -1,18 +1,18 @@
 package de.tlc4b.tlc.integration;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import de.tlc4b.tlc.TLCResults.TLCResult;
 import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
-import de.tlc4b.util.TestPair;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 import static de.tlc4b.TLC4BOption.DFID;
 import static de.tlc4b.tlc.TLCResults.TLCResult.NoError;
 import static de.tlc4b.util.TestUtil.test;
@@ -43,11 +43,11 @@ public class BasicTest extends AbstractParseMachineTest {
 
 	@Config
 	public static Configuration getConfig() {
-		List<TestPair> list = new ArrayList<>();
-		list.add(new TestPair(NoError, "./src/test/resources/composition/sees"));
-		list.add(new TestPair(NoError, "./src/test/resources/composition/sees2"));
-		list.add(new TestPair(NoError, "./src/test/resources/basics"));
-		list.add(new TestPair(NoError, "./src/test/resources/laws"));
-		return getConfiguration(list);
+		List<String> list = new ArrayList<>();
+		list.add("./src/test/resources/composition/sees");
+		list.add("./src/test/resources/composition/sees2");
+		list.add("./src/test/resources/basics");
+		list.add("./src/test/resources/laws");
+		return getConfiguration(list, NoError);
 	}
 }
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
index 5d1cdc66d0812820e488f6120fc53916d3200237..ee6c53efea3b0e323707b143adb7003df9d41a2a 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
@@ -9,7 +9,6 @@ import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
-import de.tlc4b.util.TestPair;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,8 +36,8 @@ public class AssertionErrorTest extends AbstractParseMachineTest {
 
 	@Config
 	public static Configuration getConfig() {
-		List<TestPair> list = new ArrayList<>();
-		list.add(new TestPair(AssertionError, "build/prob_examples/public_examples/TLC/AssertionError"));
-		return getConfiguration(list);
+		List<String> list = new ArrayList<>();
+		list.add("build/prob_examples/public_examples/TLC/AssertionError");
+		return getConfiguration(list, AssertionError);
 	}
 }
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
index 2a5f9e68696c4bbf1b348a6bf6583ad5327f12ce..b2a84f9bffecd79dc33e5e902ba5812c61028436 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
@@ -1,23 +1,22 @@
 package de.tlc4b.tlc.integration.probprivate;
 
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import de.tlc4b.tlc.TLCResults.TLCResult;
 import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.Deadlock;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
 @RunWith(PolySuite.class)
 public class DeadlockTest extends AbstractParseMachineTest {
 
@@ -37,9 +36,8 @@ public class DeadlockTest extends AbstractParseMachineTest {
 
 	@Config
 	public static Configuration getConfig() {
-		List<TestPair> list = new ArrayList<>();
-		list.add(new TestPair(Deadlock,
-				"build/prob_examples/public_examples/TLC/Deadlock"));
-		return getConfiguration(list);
+		List<String> list = new ArrayList<>();
+		list.add("build/prob_examples/public_examples/TLC/Deadlock");
+		return getConfiguration(list, Deadlock);
 	}
 }
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
index c3faa91daaa62e8f01c26fe331023dcd91044253..937f228f510518dcec4b4434d587ce6e50e470a1 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
@@ -1,23 +1,22 @@
 package de.tlc4b.tlc.integration.probprivate;
 
-import static org.junit.Assert.assertEquals;
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import de.tlc4b.tlc.TLCResults.TLCResult;
 import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.Goal;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
 @RunWith(PolySuite.class)
 public class GoalTest extends AbstractParseMachineTest {
 
@@ -37,9 +36,8 @@ public class GoalTest extends AbstractParseMachineTest {
 
 	@Config
 	public static Configuration getConfig() {
-		List<TestPair> list = new ArrayList<>();
-		list.add(new TestPair(Goal,
-				"build/prob_examples/public_examples/TLC/GOAL"));
-		return getConfiguration(list);
+		List<String> list = new ArrayList<>();
+		list.add("build/prob_examples/public_examples/TLC/GOAL");
+		return getConfiguration(list, Goal);
 	}
 }
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
index 158346ee41ee95364eecd3588c4487417aaf4f12..27990f04bac11f5465b38d9d7cdda62f34490fe5 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
@@ -1,23 +1,22 @@
 package de.tlc4b.tlc.integration.probprivate;
 
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import de.tlc4b.tlc.TLCResults.TLCResult;
 import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.InvariantViolation;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
 @RunWith(PolySuite.class)
 public class InvariantViolationTest extends AbstractParseMachineTest {
 
@@ -37,9 +36,8 @@ public class InvariantViolationTest extends AbstractParseMachineTest {
 
 	@Config
 	public static Configuration getConfig() {
-		List<TestPair> list = new ArrayList<>();
-		list.add(new TestPair(InvariantViolation,
-				"build/prob_examples/public_examples/TLC/InvariantViolation"));
-		return getConfiguration(list);
+		List<String> list = new ArrayList<>();
+		list.add("build/prob_examples/public_examples/TLC/InvariantViolation");
+		return getConfiguration(list, InvariantViolation);
 	}
 }
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
index aa3b8ba6a8ffb23a0d410be18b55520e3f471093..d8a42a479ee29ace587cd21f16f25538b98c8706 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
@@ -1,23 +1,22 @@
 package de.tlc4b.tlc.integration.probprivate;
 
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import de.tlc4b.tlc.TLCResults.TLCResult;
 import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.NoError;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
 @RunWith(PolySuite.class)
 public class NoErrorTest extends AbstractParseMachineTest {
 
@@ -37,10 +36,9 @@ public class NoErrorTest extends AbstractParseMachineTest {
 
 	@Config
 	public static Configuration getConfig() {
-		List<TestPair> list = new ArrayList<>();
-		list.add(new TestPair(NoError,
-				"build/prob_examples/public_examples/TLC/NoError"));
-		return getConfiguration(list);
+		List<String> list = new ArrayList<>();
+		list.add("build/prob_examples/public_examples/TLC/NoError");
+		return getConfiguration(list, NoError);
 	}
 
 }
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
index 533bc460ff2bf4e78c3c52b271429f8df109ba53..543d75cf18b7ebf29e9a8d3155a62e0ff87f12a2 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
@@ -9,7 +9,6 @@ import de.tlc4b.util.AbstractParseMachineTest;
 import de.tlc4b.util.PolySuite;
 import de.tlc4b.util.PolySuite.Config;
 import de.tlc4b.util.PolySuite.Configuration;
-import de.tlc4b.util.TestPair;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,8 +36,8 @@ public class WellDefinednessTest extends AbstractParseMachineTest  {
 
 		@Config
 		public static Configuration getConfig() {
-			List<TestPair> list = new ArrayList<>();
-			list.add(new TestPair(WellDefinednessError, "build/prob_examples/public_examples/TLC/WellDefinednessError"));
-			return getConfiguration(list);
+			List<String> list = new ArrayList<>();
+			list.add("build/prob_examples/public_examples/TLC/WellDefinednessError");
+			return getConfiguration(list, WellDefinednessError);
 		}
 }
diff --git a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
index 138b9c4f1bbc771afad44e63dc199ea7ee6fcb0a..1bf4e0e3a5e54eea04f2f1acb279f8e61b2f9121 100644
--- a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
+++ b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
@@ -67,15 +67,15 @@ public abstract class AbstractParseMachineTest {
 		};
 	}
 
-	protected static Configuration getConfiguration(List<TestPair> list) {
+	protected static Configuration getConfiguration(List<String> list, TLCResult expectedResult) {
 		List<File> allMachines = new ArrayList<>();
 
 		List<TLCResult> expectedValues = new ArrayList<>();
-		for (TestPair testPair : list) {
-			File[] machines = getMachines(testPair.getPath());
+		for (String path : list) {
+			File[] machines = getMachines(path);
 			allMachines.addAll(Arrays.asList(machines));
 			for (int i = 0; i < machines.length; i++) {
-				expectedValues.add(testPair.getResult());
+				expectedValues.add(expectedResult);
 			}
 		}
 
diff --git a/src/test/java/de/tlc4b/util/TestPair.java b/src/test/java/de/tlc4b/util/TestPair.java
deleted file mode 100644
index 8bdc29b34a9d39368025f3a1a5831f140c85d2e1..0000000000000000000000000000000000000000
--- a/src/test/java/de/tlc4b/util/TestPair.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.tlc4b.util;
-
-import de.tlc4b.tlc.TLCResults.TLCResult;
-
-
-public class TestPair {
-	private final TLCResult error;
-	private final String path;
-
-	public TestPair(TLCResult error, String path) {
-		this.error = error;
-		this.path = path;
-	}
-
-	public TLCResult getResult() {
-		return error;
-	}
-
-	public String getPath() {
-		return path;
-	}
-}
\ No newline at end of file