diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26e19d471f9c51d35944635a2c0ffd0883de182b..c552fd27db167acd8cbe398a154e32c0f5c252f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,9 +2,11 @@ variables:
   # all submodules will be cloned recursively upon start of CI job
   GIT_SUBMODULE_STRATEGY: recursive
   GIT_SSL_NO_VERIFY: "true"
+  ATLAS_LOCAL_ROOT_BASE: /cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
 
 stages:
   - build
+  - test
 
 ##########################
 # BUILD stage            #                                
@@ -16,6 +18,30 @@ build_image:
   #              in the following stages of the pipeline for testing the code
   stage: build
   tags:
-    - docker-image-build
+    - cvmfs
+    - docker
   script:
-    - ignore
+    - yum -y install redhat-lsb redhat-lsb-core man uuid-devel libuuid libuuid-devel
+    - mkdir build
+    - cd build
+    - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
+    - set +e && asetup master,latest,Athena; set -e
+    - cmake ../../calypso
+    - make
+  artifacts:
+    paths:
+    - build/
+
+test_unittest:
+  stage: test
+  tags:
+    - cvmfs
+    - docker
+  script: 
+    - yum -y install man
+    - cd build
+    - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
+    - set +e && asetup master,latest,Athena; set -e
+    - ctest -j12
+  dependencies:
+    - build_image
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 196fb3b8c347c20c3edd86a931a36c9876e8eca5..a30d84f48f477be4f3a7a9a0e3ec55a99d10781b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package( Athena )
 
 atlas_ctest_setup()
 
-atlas_project( Faser 1.0.0
+atlas_project( Calypso 1.0.0
   USE ${ATLAS_PROJECT} ${${ATLAS_PROJECT}_VERSION} )
 
 lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/env_setup.sh )
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index cca60d25d981e0e50d31c3c398c185d6d12cf8b6..0000000000000000000000000000000000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# The release set in this Dockerfile defines the release of the whole project
-# and is parsed by every setup script and by the installation instructions.
-# Be aware of this effect if you edit the release here!
-FROM atlas/atlas_external_cvmfs
-ADD . /calypso
-WORKDIR /build
-RUN setupATLAS && \
-    asetup master,latest,Athena && \
-    cmake -DCMAKE_INSTALL_PREFIX=../run ../calypso && \
-    make
-
diff --git a/xAOD/xAODFaserBase/share/ut_xAODFaserObjectType_test.ref b/xAOD/xAODFaserBase/share/ut_xAODFaserObjectType_test.ref
index 4b97169887aa3febeae8301c2d28af06d3419ad0..be845efbd736238ad91cf5bcd5569cb2a43fd7ad 100644
--- a/xAOD/xAODFaserBase/share/ut_xAODFaserObjectType_test.ref
+++ b/xAOD/xAODFaserBase/share/ut_xAODFaserObjectType_test.ref
@@ -1,2 +1,2 @@
-xAOD::Type::Track, xAOD::Type::CaloCluster
-UNKNOWN
+xAOD::FaserType::Track, xAOD::FaserType::CaloCluster
+UNKNOWN
\ No newline at end of file
diff --git a/xAOD/xAODFaserTracking/share/xAODFaserTracking_StripRawData_test.ref b/xAOD/xAODFaserTracking/share/xAODFaserTracking_StripRawData_test.ref
index cb3d5a59d234d9cf97602a3b395ace708f65766d..1a59d6a5e98566b75ad18e0c59df7514c1214c47 100644
--- a/xAOD/xAODFaserTracking/share/xAODFaserTracking_StripRawData_test.ref
+++ b/xAOD/xAODFaserTracking/share/xAODFaserTracking_StripRawData_test.ref
@@ -2,7 +2,3 @@ id = 1111111111111
 word = 1010111
  Dumping StripRawDataAuxContainer
 id:1.11111e+12, dataword:1.01011e+06,
-id = 1111111111111
-word = 1010111
- Dumping StripRawDataAuxContainer
-id:1.11111e+12, dataword:1.01011e+06,