diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d12cb41b55e78b762a841965507f098f1be9f16..4d86c31b554ee90df1cd5887237e265b30119876 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,31 @@
-image: ubuntu
+image: irmb/virtualfluids-deps:latest
 
 stages:
   - build
+  - test
 
 build:
   stage: build
 
+  artifacts:
+    paths:
+      - build/
+
   before_script:
-    - export CAB_MACHINE=ELLADAN
     - export DEBIAN_FRONTEND=noninteractive
     - apt-get update
-    - apt-get install build-essential -y
-    - apt-get install cmake -y
-    - apt-get install ninja-build -y
-    - apt-get install openmpi-bin -y
-    - apt-get install libomp-dev -y
-    - apt-get install nvidia-cuda-dev  nvidia-cuda-toolkit -y
 
   script:
-    - cmake -S . -B build -DBUILD_VF_CPU:BOOL=ON
-    - cmake --build build --target VirtualFluidsCore
\ No newline at end of file
+    - cmake -S . -B build -DBUILD_VF_CPU:BOOL=ON -DBUILD_VF_UNIT_TESTS:BOOL=ON
+    - cmake --build build --target VirtualFluidsCore
+    - cmake --build build --target basicsTests
+
+
+test:
+  stage: test
+
+  before_script:
+    - export DEBIAN_FRONTEND=noninteractive
+
+  script:
+    - build/bin/basicsTests
\ No newline at end of file
diff --git a/CMake/cmake_config_files/BILBO.config.cmake b/CMake/cmake_config_files/BILBO.config.cmake
index 3c7f0f728ddad36d22ff1d65d83aa7927c14ed48..093fe3200837a3916e8a14b16042732c2b6db218 100644
--- a/CMake/cmake_config_files/BILBO.config.cmake
+++ b/CMake/cmake_config_files/BILBO.config.cmake
@@ -3,11 +3,3 @@
 # Responsible: Soeren Peters
 # OS:          MacOS X
 #################################################################################
-
-#################################################################################
-#  METIS
-#################################################################################
-SET(METIS_INCLUDEDIR "/usr/local/include")
-SET(METIS_DEBUG_LIBRARY "/usr/local/lib/libmetis.a")
-SET(METIS_RELEASE_LIBRARY "/usr/local/lib/libmetis.a")
-
diff --git a/CMake/cmake_config_files/ELLADAN.config.cmake b/CMake/cmake_config_files/ELLADAN.config.cmake
index 80291455e6db49f542b847640ec187620d7eacca..ff87d1b9d8d8aac05fe72cb1e303ad7de6663e8f 100644
--- a/CMake/cmake_config_files/ELLADAN.config.cmake
+++ b/CMake/cmake_config_files/ELLADAN.config.cmake
@@ -5,10 +5,5 @@
 #################################################################################
 
 set(NVCUDASAMPLES_ROOT "~/cuda-samples/Common")
-#################################################################################
-#  METIS
-#################################################################################
-set(METIS_INCLUDEDIR "/usr/include")
-set(METIS_DEBUG_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
-set(METIS_RELEASE_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
+