diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
index 154127af8f6b9aa05c36c54581c2222c35623038..ac86b9f6234aedbea243a0794db9204daa6d1ed8 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
@@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
 
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
index a660de8eea80030e605829782c2af379675f7dd7..5aa5c6ed045fa0051c57b18e2a0455b0489fea35 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
@@ -8,7 +8,6 @@ import de.tudresden.inf.st.ttc18live.translator.XmlToJastaddTranslator;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java
index 57c256b70314e667b0ef0a47c38fe12369a011fd..a4d10f84ab3426d5087c20e7765ebc37e817026d 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java
@@ -175,7 +175,7 @@ public class Main {
   private static XmlToJastaddTranslator parseSocialNetwork() throws JAXBException, ParseException {
     JAXBContext jc = JAXBContext.newInstance(ParsedSocialNetwork.class);
     Unmarshaller unmarshaller = jc.createUnmarshaller();
-    Path model1Content = Paths.get("src", "main", "resources", Integer.toString(changeSet), "initial.xmi");
+    Path model1Content = Paths.get("src", "test", "resources", Integer.toString(changeSet), "initial.xmi");
     ParsedSocialNetwork parsedSocialNetwork = (ParsedSocialNetwork) unmarshaller.unmarshal(model1Content.toFile());
     logger.info("Users: {}, Posts: {}",
         parsedSocialNetwork.users.size(), parsedSocialNetwork.posts.size());
@@ -190,7 +190,7 @@ public class Main {
     JAXBContext jc = JAXBContext.newInstance(ParsedModelChangeSet.class);
     Unmarshaller unmarshaller = jc.createUnmarshaller();
     unmarshaller.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
-    Path modelContent = Paths.get("src", "main", "resources", Integer.toString(changeSet), suffix);
+    Path modelContent = Paths.get("src", "test", "resources", Integer.toString(changeSet), suffix);
     if (!modelContent.toFile().exists()) {
       logger.warn("File {} does not exist!", modelContent);
       return null;
diff --git a/solve/src/main/resources/1/change01.xmi b/solve/src/test/resources/1/change01.xmi
similarity index 100%
rename from solve/src/main/resources/1/change01.xmi
rename to solve/src/test/resources/1/change01.xmi
diff --git a/solve/src/main/resources/1/change02.xmi b/solve/src/test/resources/1/change02.xmi
similarity index 100%
rename from solve/src/main/resources/1/change02.xmi
rename to solve/src/test/resources/1/change02.xmi
diff --git a/solve/src/main/resources/1/change03.xmi b/solve/src/test/resources/1/change03.xmi
similarity index 100%
rename from solve/src/main/resources/1/change03.xmi
rename to solve/src/test/resources/1/change03.xmi
diff --git a/solve/src/main/resources/1/change04.xmi b/solve/src/test/resources/1/change04.xmi
similarity index 100%
rename from solve/src/main/resources/1/change04.xmi
rename to solve/src/test/resources/1/change04.xmi
diff --git a/solve/src/main/resources/1/change05.xmi b/solve/src/test/resources/1/change05.xmi
similarity index 100%
rename from solve/src/main/resources/1/change05.xmi
rename to solve/src/test/resources/1/change05.xmi
diff --git a/solve/src/main/resources/1/change06.xmi b/solve/src/test/resources/1/change06.xmi
similarity index 100%
rename from solve/src/main/resources/1/change06.xmi
rename to solve/src/test/resources/1/change06.xmi
diff --git a/solve/src/main/resources/1/change07.xmi b/solve/src/test/resources/1/change07.xmi
similarity index 100%
rename from solve/src/main/resources/1/change07.xmi
rename to solve/src/test/resources/1/change07.xmi
diff --git a/solve/src/main/resources/1/change08.xmi b/solve/src/test/resources/1/change08.xmi
similarity index 100%
rename from solve/src/main/resources/1/change08.xmi
rename to solve/src/test/resources/1/change08.xmi
diff --git a/solve/src/main/resources/1/change09.xmi b/solve/src/test/resources/1/change09.xmi
similarity index 100%
rename from solve/src/main/resources/1/change09.xmi
rename to solve/src/test/resources/1/change09.xmi
diff --git a/solve/src/main/resources/1/change10.xmi b/solve/src/test/resources/1/change10.xmi
similarity index 100%
rename from solve/src/main/resources/1/change10.xmi
rename to solve/src/test/resources/1/change10.xmi
diff --git a/solve/src/main/resources/1/change11.xmi b/solve/src/test/resources/1/change11.xmi
similarity index 100%
rename from solve/src/main/resources/1/change11.xmi
rename to solve/src/test/resources/1/change11.xmi
diff --git a/solve/src/main/resources/1/change12.xmi b/solve/src/test/resources/1/change12.xmi
similarity index 100%
rename from solve/src/main/resources/1/change12.xmi
rename to solve/src/test/resources/1/change12.xmi
diff --git a/solve/src/main/resources/1/change13.xmi b/solve/src/test/resources/1/change13.xmi
similarity index 100%
rename from solve/src/main/resources/1/change13.xmi
rename to solve/src/test/resources/1/change13.xmi
diff --git a/solve/src/main/resources/1/change14.xmi b/solve/src/test/resources/1/change14.xmi
similarity index 100%
rename from solve/src/main/resources/1/change14.xmi
rename to solve/src/test/resources/1/change14.xmi
diff --git a/solve/src/main/resources/1/change15.xmi b/solve/src/test/resources/1/change15.xmi
similarity index 100%
rename from solve/src/main/resources/1/change15.xmi
rename to solve/src/test/resources/1/change15.xmi
diff --git a/solve/src/main/resources/1/change16.xmi b/solve/src/test/resources/1/change16.xmi
similarity index 100%
rename from solve/src/main/resources/1/change16.xmi
rename to solve/src/test/resources/1/change16.xmi
diff --git a/solve/src/main/resources/1/change17.xmi b/solve/src/test/resources/1/change17.xmi
similarity index 100%
rename from solve/src/main/resources/1/change17.xmi
rename to solve/src/test/resources/1/change17.xmi
diff --git a/solve/src/main/resources/1/change18.xmi b/solve/src/test/resources/1/change18.xmi
similarity index 100%
rename from solve/src/main/resources/1/change18.xmi
rename to solve/src/test/resources/1/change18.xmi
diff --git a/solve/src/main/resources/1/change19.xmi b/solve/src/test/resources/1/change19.xmi
similarity index 100%
rename from solve/src/main/resources/1/change19.xmi
rename to solve/src/test/resources/1/change19.xmi
diff --git a/solve/src/main/resources/1/change20.xmi b/solve/src/test/resources/1/change20.xmi
similarity index 100%
rename from solve/src/main/resources/1/change20.xmi
rename to solve/src/test/resources/1/change20.xmi
diff --git a/solve/src/main/resources/1/initial.xmi b/solve/src/test/resources/1/initial.xmi
similarity index 100%
rename from solve/src/main/resources/1/initial.xmi
rename to solve/src/test/resources/1/initial.xmi
diff --git a/solve/src/main/resources/128/initial.xmi b/solve/src/test/resources/128/initial.xmi
similarity index 100%
rename from solve/src/main/resources/128/initial.xmi
rename to solve/src/test/resources/128/initial.xmi
diff --git a/solve/src/main/resources/16/change01.xmi b/solve/src/test/resources/16/change01.xmi
similarity index 100%
rename from solve/src/main/resources/16/change01.xmi
rename to solve/src/test/resources/16/change01.xmi
diff --git a/solve/src/main/resources/16/change02.xmi b/solve/src/test/resources/16/change02.xmi
similarity index 100%
rename from solve/src/main/resources/16/change02.xmi
rename to solve/src/test/resources/16/change02.xmi
diff --git a/solve/src/main/resources/16/change03.xmi b/solve/src/test/resources/16/change03.xmi
similarity index 100%
rename from solve/src/main/resources/16/change03.xmi
rename to solve/src/test/resources/16/change03.xmi
diff --git a/solve/src/main/resources/16/change04.xmi b/solve/src/test/resources/16/change04.xmi
similarity index 100%
rename from solve/src/main/resources/16/change04.xmi
rename to solve/src/test/resources/16/change04.xmi
diff --git a/solve/src/main/resources/16/change05.xmi b/solve/src/test/resources/16/change05.xmi
similarity index 100%
rename from solve/src/main/resources/16/change05.xmi
rename to solve/src/test/resources/16/change05.xmi
diff --git a/solve/src/main/resources/16/change06.xmi b/solve/src/test/resources/16/change06.xmi
similarity index 100%
rename from solve/src/main/resources/16/change06.xmi
rename to solve/src/test/resources/16/change06.xmi
diff --git a/solve/src/main/resources/16/change07.xmi b/solve/src/test/resources/16/change07.xmi
similarity index 100%
rename from solve/src/main/resources/16/change07.xmi
rename to solve/src/test/resources/16/change07.xmi
diff --git a/solve/src/main/resources/16/change08.xmi b/solve/src/test/resources/16/change08.xmi
similarity index 100%
rename from solve/src/main/resources/16/change08.xmi
rename to solve/src/test/resources/16/change08.xmi
diff --git a/solve/src/main/resources/16/change09.xmi b/solve/src/test/resources/16/change09.xmi
similarity index 100%
rename from solve/src/main/resources/16/change09.xmi
rename to solve/src/test/resources/16/change09.xmi
diff --git a/solve/src/main/resources/16/initial.xmi b/solve/src/test/resources/16/initial.xmi
similarity index 100%
rename from solve/src/main/resources/16/initial.xmi
rename to solve/src/test/resources/16/initial.xmi
diff --git a/solve/src/main/resources/2/change01.xmi b/solve/src/test/resources/2/change01.xmi
similarity index 100%
rename from solve/src/main/resources/2/change01.xmi
rename to solve/src/test/resources/2/change01.xmi
diff --git a/solve/src/main/resources/2/change02.xmi b/solve/src/test/resources/2/change02.xmi
similarity index 100%
rename from solve/src/main/resources/2/change02.xmi
rename to solve/src/test/resources/2/change02.xmi
diff --git a/solve/src/main/resources/2/change03.xmi b/solve/src/test/resources/2/change03.xmi
similarity index 100%
rename from solve/src/main/resources/2/change03.xmi
rename to solve/src/test/resources/2/change03.xmi
diff --git a/solve/src/main/resources/2/change04.xmi b/solve/src/test/resources/2/change04.xmi
similarity index 100%
rename from solve/src/main/resources/2/change04.xmi
rename to solve/src/test/resources/2/change04.xmi
diff --git a/solve/src/main/resources/2/change05.xmi b/solve/src/test/resources/2/change05.xmi
similarity index 100%
rename from solve/src/main/resources/2/change05.xmi
rename to solve/src/test/resources/2/change05.xmi
diff --git a/solve/src/main/resources/2/change06.xmi b/solve/src/test/resources/2/change06.xmi
similarity index 100%
rename from solve/src/main/resources/2/change06.xmi
rename to solve/src/test/resources/2/change06.xmi
diff --git a/solve/src/main/resources/2/change07.xmi b/solve/src/test/resources/2/change07.xmi
similarity index 100%
rename from solve/src/main/resources/2/change07.xmi
rename to solve/src/test/resources/2/change07.xmi
diff --git a/solve/src/main/resources/2/change08.xmi b/solve/src/test/resources/2/change08.xmi
similarity index 100%
rename from solve/src/main/resources/2/change08.xmi
rename to solve/src/test/resources/2/change08.xmi
diff --git a/solve/src/main/resources/2/change09.xmi b/solve/src/test/resources/2/change09.xmi
similarity index 100%
rename from solve/src/main/resources/2/change09.xmi
rename to solve/src/test/resources/2/change09.xmi
diff --git a/solve/src/main/resources/2/change1.documented.xmi b/solve/src/test/resources/2/change1.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change1.documented.xmi
rename to solve/src/test/resources/2/change1.documented.xmi
diff --git a/solve/src/main/resources/2/change10.documented.xmi b/solve/src/test/resources/2/change10.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change10.documented.xmi
rename to solve/src/test/resources/2/change10.documented.xmi
diff --git a/solve/src/main/resources/2/change10.xmi b/solve/src/test/resources/2/change10.xmi
similarity index 100%
rename from solve/src/main/resources/2/change10.xmi
rename to solve/src/test/resources/2/change10.xmi
diff --git a/solve/src/main/resources/2/change11.documented.xmi b/solve/src/test/resources/2/change11.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change11.documented.xmi
rename to solve/src/test/resources/2/change11.documented.xmi
diff --git a/solve/src/main/resources/2/change11.xmi b/solve/src/test/resources/2/change11.xmi
similarity index 100%
rename from solve/src/main/resources/2/change11.xmi
rename to solve/src/test/resources/2/change11.xmi
diff --git a/solve/src/main/resources/2/change12.documented.xmi b/solve/src/test/resources/2/change12.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change12.documented.xmi
rename to solve/src/test/resources/2/change12.documented.xmi
diff --git a/solve/src/main/resources/2/change12.xmi b/solve/src/test/resources/2/change12.xmi
similarity index 100%
rename from solve/src/main/resources/2/change12.xmi
rename to solve/src/test/resources/2/change12.xmi
diff --git a/solve/src/main/resources/2/change13.documented.xmi b/solve/src/test/resources/2/change13.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change13.documented.xmi
rename to solve/src/test/resources/2/change13.documented.xmi
diff --git a/solve/src/main/resources/2/change13.xmi b/solve/src/test/resources/2/change13.xmi
similarity index 100%
rename from solve/src/main/resources/2/change13.xmi
rename to solve/src/test/resources/2/change13.xmi
diff --git a/solve/src/main/resources/2/change14.documented.xmi b/solve/src/test/resources/2/change14.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change14.documented.xmi
rename to solve/src/test/resources/2/change14.documented.xmi
diff --git a/solve/src/main/resources/2/change14.xmi b/solve/src/test/resources/2/change14.xmi
similarity index 100%
rename from solve/src/main/resources/2/change14.xmi
rename to solve/src/test/resources/2/change14.xmi
diff --git a/solve/src/main/resources/2/change15.documented.xmi b/solve/src/test/resources/2/change15.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change15.documented.xmi
rename to solve/src/test/resources/2/change15.documented.xmi
diff --git a/solve/src/main/resources/2/change15.xmi b/solve/src/test/resources/2/change15.xmi
similarity index 100%
rename from solve/src/main/resources/2/change15.xmi
rename to solve/src/test/resources/2/change15.xmi
diff --git a/solve/src/main/resources/2/change16.documented.xmi b/solve/src/test/resources/2/change16.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change16.documented.xmi
rename to solve/src/test/resources/2/change16.documented.xmi
diff --git a/solve/src/main/resources/2/change16.xmi b/solve/src/test/resources/2/change16.xmi
similarity index 100%
rename from solve/src/main/resources/2/change16.xmi
rename to solve/src/test/resources/2/change16.xmi
diff --git a/solve/src/main/resources/2/change17.documented.xmi b/solve/src/test/resources/2/change17.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change17.documented.xmi
rename to solve/src/test/resources/2/change17.documented.xmi
diff --git a/solve/src/main/resources/2/change17.xmi b/solve/src/test/resources/2/change17.xmi
similarity index 100%
rename from solve/src/main/resources/2/change17.xmi
rename to solve/src/test/resources/2/change17.xmi
diff --git a/solve/src/main/resources/2/change18.documented.xmi b/solve/src/test/resources/2/change18.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change18.documented.xmi
rename to solve/src/test/resources/2/change18.documented.xmi
diff --git a/solve/src/main/resources/2/change18.xmi b/solve/src/test/resources/2/change18.xmi
similarity index 100%
rename from solve/src/main/resources/2/change18.xmi
rename to solve/src/test/resources/2/change18.xmi
diff --git a/solve/src/main/resources/2/change19.documented.xmi b/solve/src/test/resources/2/change19.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change19.documented.xmi
rename to solve/src/test/resources/2/change19.documented.xmi
diff --git a/solve/src/main/resources/2/change19.xmi b/solve/src/test/resources/2/change19.xmi
similarity index 100%
rename from solve/src/main/resources/2/change19.xmi
rename to solve/src/test/resources/2/change19.xmi
diff --git a/solve/src/main/resources/2/change2.documented.xmi b/solve/src/test/resources/2/change2.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change2.documented.xmi
rename to solve/src/test/resources/2/change2.documented.xmi
diff --git a/solve/src/main/resources/2/change20.documented.xmi b/solve/src/test/resources/2/change20.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change20.documented.xmi
rename to solve/src/test/resources/2/change20.documented.xmi
diff --git a/solve/src/main/resources/2/change20.xmi b/solve/src/test/resources/2/change20.xmi
similarity index 100%
rename from solve/src/main/resources/2/change20.xmi
rename to solve/src/test/resources/2/change20.xmi
diff --git a/solve/src/main/resources/2/change3.documented.xmi b/solve/src/test/resources/2/change3.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change3.documented.xmi
rename to solve/src/test/resources/2/change3.documented.xmi
diff --git a/solve/src/main/resources/2/change4.documented.xmi b/solve/src/test/resources/2/change4.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change4.documented.xmi
rename to solve/src/test/resources/2/change4.documented.xmi
diff --git a/solve/src/main/resources/2/change5.documented.xmi b/solve/src/test/resources/2/change5.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change5.documented.xmi
rename to solve/src/test/resources/2/change5.documented.xmi
diff --git a/solve/src/main/resources/2/change6.documented.xmi b/solve/src/test/resources/2/change6.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change6.documented.xmi
rename to solve/src/test/resources/2/change6.documented.xmi
diff --git a/solve/src/main/resources/2/change7.documented.xmi b/solve/src/test/resources/2/change7.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change7.documented.xmi
rename to solve/src/test/resources/2/change7.documented.xmi
diff --git a/solve/src/main/resources/2/change8.documented.xmi b/solve/src/test/resources/2/change8.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change8.documented.xmi
rename to solve/src/test/resources/2/change8.documented.xmi
diff --git a/solve/src/main/resources/2/change9.documented.xmi b/solve/src/test/resources/2/change9.documented.xmi
similarity index 100%
rename from solve/src/main/resources/2/change9.documented.xmi
rename to solve/src/test/resources/2/change9.documented.xmi
diff --git a/solve/src/main/resources/2/initial.xmi b/solve/src/test/resources/2/initial.xmi
similarity index 100%
rename from solve/src/main/resources/2/initial.xmi
rename to solve/src/test/resources/2/initial.xmi
diff --git a/solve/src/main/resources/256/initial.xmi b/solve/src/test/resources/256/initial.xmi
similarity index 100%
rename from solve/src/main/resources/256/initial.xmi
rename to solve/src/test/resources/256/initial.xmi
diff --git a/solve/src/main/resources/32/initial.xmi b/solve/src/test/resources/32/initial.xmi
similarity index 100%
rename from solve/src/main/resources/32/initial.xmi
rename to solve/src/test/resources/32/initial.xmi
diff --git a/solve/src/main/resources/4/initial.xmi b/solve/src/test/resources/4/initial.xmi
similarity index 100%
rename from solve/src/main/resources/4/initial.xmi
rename to solve/src/test/resources/4/initial.xmi
diff --git a/solve/src/main/resources/512/initial.xmi b/solve/src/test/resources/512/initial.xmi
similarity index 100%
rename from solve/src/main/resources/512/initial.xmi
rename to solve/src/test/resources/512/initial.xmi
diff --git a/solve/src/main/resources/64/initial.xmi b/solve/src/test/resources/64/initial.xmi
similarity index 100%
rename from solve/src/main/resources/64/initial.xmi
rename to solve/src/test/resources/64/initial.xmi
diff --git a/solve/src/main/resources/8/initial.xmi b/solve/src/test/resources/8/initial.xmi
similarity index 100%
rename from solve/src/main/resources/8/initial.xmi
rename to solve/src/test/resources/8/initial.xmi
diff --git a/expected-results.csv b/solve/src/test/resources/expected-results.csv
similarity index 100%
rename from expected-results.csv
rename to solve/src/test/resources/expected-results.csv
diff --git a/solve/src/main/resources/initial.xmi b/solve/src/test/resources/initial.xmi
similarity index 100%
rename from solve/src/main/resources/initial.xmi
rename to solve/src/test/resources/initial.xmi