diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e234847f5f748c79e4f9e97a93c668dc7f94188..73c170f289ec01ce8e056ebcde31ba51c0a85ffc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,26 +31,71 @@ test_benchmark:
       - dockered
   script:
     - docker pull $CONTAINER_TEST_IMAGE
-    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew benchmarkFull -Pscenario=0,small 2>&1 | tee benchmarkFull.log
+    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon benchmarkFull -Pscenario=0,small 2>&1 | tee benchmarkFull.log
     - grep -v "BUILD FAILED" benchmarkFull.log
 
-test_unit_tests_genetic:
+test_genetic:
   stage: test
   tags:
       - dockered
   allow_failure: true
   script:
     - docker pull $CONTAINER_TEST_IMAGE
-    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew jastadd-mquat-solver-genetic:test
+    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-genetic:test
 
-test_unit_tests:
+test_aco:
   stage: test
   tags:
       - dockered
+  allow_failure: true
+  script:
+    - docker pull $CONTAINER_TEST_IMAGE
+    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-aco:test
+
+# test_emfer:
+#   stage: test
+#   tags:
+#       - dockered
+#   allow_failure: true
+#   script:
+#     - docker pull $CONTAINER_TEST_IMAGE
+#     - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-emfer:test
+
+test_ilp:
+  stage: test
+  tags:
+      - dockered
+  allow_failure: true
+  script:
+    - docker pull $CONTAINER_TEST_IMAGE
+    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-ilp:test
+
+test_random:
+  stage: test
+  tags:
+      - dockered
+  allow_failure: true
+  script:
+    - docker pull $CONTAINER_TEST_IMAGE
+    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-random:test
+
+test_simple:
+  stage: test
+  tags:
+      - dockered
+  allow_failure: true
   script:
     - docker pull $CONTAINER_TEST_IMAGE
-    - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'echo "test.enabled = false" >> /ttc18/jastadd-mquat-solver-genetic/build.gradle && /ttc18/gradlew test'
+    - docker run $CONTAINER_TEST_IMAGE /ttc18/gradlew --no-daemon jastadd-mquat-solver-simple:test
 
+# test_unit_tests:
+#   stage: test
+#   tags:
+#       - dockered
+#   script:
+#     - docker pull $CONTAINER_TEST_IMAGE
+#     - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'echo "test.enabled = false" >> /ttc18/jastadd-mquat-solver-genetic/build.gradle && /ttc18/gradlew --no-daemon test'
+# 
 release-image:
     stage: release
     tags:
diff --git a/Dockerfile b/Dockerfile
index 710f68de24609815afd273582e86010ffd4e0d52..d4f18e51be1fb56ed3db9da085a33263bc99eefe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,14 +58,8 @@ RUN echo "glpkPath = /usr/lib/x86_64-linux-gnu/jni" > gradle.properties
 #RUN sed -i '/jastadd-mquat-solver-emfer/d' settings.gradle
 #RUN sed -i '/jastadd-mquat-solver-emfer/d' jastadd-mquat-benchmark/build.gradle
 #RUN sed -i '/EMFeRSolver/d' jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java
-RUN echo "test.enabled = false" >> ./jastadd-mquat-solver-emfer/build.gradle
+#RUN echo "test.enabled = false" >> ./jastadd-mquat-solver-emfer/build.gradle
 RUN sed -i 's/MINUTES/SECONDS/g' jastadd-mquat-benchmark/src/main/resources/scenarios.json
 
 # then build
-RUN ./gradlew --no-daemon assemble
-RUN ./gradlew --no-daemon compileTestJava
-RUN ./gradlew --no-daemon compileJava
-
-#RUN ./gradlew test
-#RUN ./gradlew benchmarkFull -Pscenario=0,small
-#RUN ./gradlew jastadd-mquat-solver-random:test
+RUN ./gradlew --no-daemon assemble compileTestJava