diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d97b8f89450f73bf735872a7ac1c230d62cecfc..c99aed7585bd1ec979bc6a1340985f8f67b4fe7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,9 +26,9 @@ download_data:
   script:
     - mkdir data && cd data
     - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/$TEST_DATASET_NAME -O $TEST_DATASET_NAME && tar -xf $TEST_DATASET_NAME && rm -f $TEST_DATA_NAME
-    - wget -q www.astron.nl/citt/ci_data/prefactor/$TEST_HBA_DATASET_NAME -O $TEST_HBA_DATASET_NAME && tar -xfz $TEST_HBA_DATASET_NAME && rm -f $TEST_HBA_DATASET_NAME
-    - wget -q www.astron.nl/citt/ci_data/prefactor/$CALIBRATOR_HBA_RESULTS_NAME -O $CALIBRATOR_HBA_RESULTS_NAME && tar -xfz $CALIBRATOR_HBA_RESULTS_NAME && rm -f $CALIBRATOR_HBA_RESULTS_NAME
-    - wget -q www.astron.nl/citt/ci_data/prefactor/$TARGET_HBA_RESULTS_NAME -O $TARGET_HBA_RESULTS_NAME && tar -xfz $TARGET_HBA_RESULTS_NAME && rm -f $TARGET_HBA_RESULTS_NAME
+    - wget -q www.astron.nl/citt/ci_data/prefactor/$TEST_HBA_DATASET_NAME -O $TEST_HBA_DATASET_NAME && tar xfz $TEST_HBA_DATASET_NAME && rm -f $TEST_HBA_DATASET_NAME
+    - wget -q www.astron.nl/citt/ci_data/prefactor/$CALIBRATOR_HBA_RESULTS_NAME -O $CALIBRATOR_HBA_RESULTS_NAME && tar xfz $CALIBRATOR_HBA_RESULTS_NAME && rm -f $CALIBRATOR_HBA_RESULTS_NAME
+    - wget -q www.astron.nl/citt/ci_data/prefactor/$TARGET_HBA_RESULTS_NAME -O $TARGET_HBA_RESULTS_NAME && tar xfz $TARGET_HBA_RESULTS_NAME && rm -f $TARGET_HBA_RESULTS_NAME
     - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/example.h5 -O example.h5
     - wget -q https://git.astron.nl/eosc/prefactor3-cwl/-/raw/master/test_data/A-Team_lowres.sourcedb -O A-Team_lowres.sourcedb
   artifacts:
diff --git a/test_jobs/HBA_calibrator.json b/test_jobs/HBA_calibrator.json
index b7a8f5ce03717f24904fbae3999108870ea753e1..1d26efbc51d7f90e0756dbe16d525aa586471c3e 100644
--- a/test_jobs/HBA_calibrator.json
+++ b/test_jobs/HBA_calibrator.json
@@ -2,123 +2,123 @@
     "msin": [
         {
             "class": "Directory",
-            "path": "../data/L667520_SB000_uv_12timeslots.MS"
+            "path": "../data/L667520_SB000_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB001_uv_12timeslots.MS"
+            "path": "../data/L667520_SB001_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB002_uv_12timeslots.MS"
+            "path": "../data/L667520_SB002_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB003_uv_12timeslots.MS"
+            "path": "../data/L667520_SB003_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB004_uv_12timeslots.MS"
+            "path": "../data/L667520_SB004_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB005_uv_12timeslots.MS"
+            "path": "../data/L667520_SB005_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB006_uv_12timeslots.MS"
+            "path": "../data/L667520_SB006_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB007_uv_12timeslots.MS"
+            "path": "../data/L667520_SB007_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB008_uv_12timeslots.MS"
+            "path": "../data/L667520_SB008_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB009_uv_12timeslots.MS"
+            "path": "../data/L667520_SB009_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB010_uv_12timeslots.MS"
+            "path": "../data/L667520_SB010_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB011_uv_12timeslots.MS"
+            "path": "../data/L667520_SB011_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB012_uv_12timeslots.MS"
+            "path": "../data/L667520_SB012_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB013_uv_12timeslots.MS"
+            "path": "../data/L667520_SB013_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB014_uv_12timeslots.MS"
+            "path": "../data/L667520_SB014_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB015_uv_12timeslots.MS"
+            "path": "../data/L667520_SB015_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB016_uv_12timeslots.MS"
+            "path": "../data/L667520_SB016_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB017_uv_12timeslots.MS"
+            "path": "../data/L667520_SB017_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB018_uv_12timeslots.MS"
+            "path": "../data/L667520_SB018_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB019_uv_12timeslots.MS"
+            "path": "../data/L667520_SB019_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB020_uv_12timeslots.MS"
+            "path": "../data/L667520_SB020_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB021_uv_12timeslots.MS"
+            "path": "../data/L667520_SB021_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB022_uv_12timeslots.MS"
+            "path": "../data/L667520_SB022_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB023_uv_12timeslots.MS"
+            "path": "../data/L667520_SB023_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB024_uv_12timeslots.MS"
+            "path": "../data/L667520_SB024_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB025_uv_12timeslots.MS"
+            "path": "../data/L667520_SB025_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB026_uv_12timeslots.MS"
+            "path": "../data/L667520_SB026_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB027_uv_12timeslots.MS"
+            "path": "../data/L667520_SB027_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB028_uv_12timeslots.MS"
+            "path": "../data/L667520_SB028_uv.MS"
         },
         {
             "class": "Directory",
-            "path": "../data/L667520_SB029_uv_12timeslots.MS"
+            "path": "../data/L667520_SB029_uv.MS"
         },
     ],
     "A-Team_skymodel": {