diff --git a/.github/workflows/cpputest.yml b/.github/workflows/cpputest.yml
index b6e7c0a50..e588b8c8f 100644
--- a/.github/workflows/cpputest.yml
+++ b/.github/workflows/cpputest.yml
@@ -23,4 +23,4 @@ jobs:
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
       - name: Test
         working-directory: ${{github.workspace}}/build
-        run: ctest -C ${{env.BUILD_TYPE}}
+        run: ctest -C ${{env.BUILD_TYPE}} --rerun-failed --output-on-failure
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f1252811b..4b61df95d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "cpputestExplorer.testExecutable": "${workspaceFolder}/build/tests/picotracker_lora_tests",
-    "cpputestExplorer.testExecutablePath": "${workspaceFolder}/build/tests"
+    "cpputestExplorer.testExecutable": "${workspaceFolder}/build/tests/tests/picotracker_lora_tests",
+    "cpputestExplorer.testExecutablePath": "${workspaceFolder}/build/tests/tests"
 }
diff --git a/CMakePresets.json b/CMakePresets.json
index ff006e74f..7fc57c534 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -10,7 +10,6 @@
             "name": "common_configs",
             "displayName": "common_configs",
             "description": "Default Configurations for LoRaMAC node",
-            "binaryDir": "${sourceDir}/out/build/${presetName}",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
                 "APPLICATION": "LoRaMac",
@@ -39,6 +38,7 @@
             "name": "unittesting_configs",
             "description": "Configurations for unittesting",
             "displayName": "unittesting_configs",
+            "binaryDir": "${sourceDir}/build/tests",
             "inherits": [
                 "common_configs"
             ],
@@ -50,6 +50,7 @@
             "name": "on_target_configs",
             "description": "Configurations for building for target: STM32L072",
             "displayName": "on_target_configs",
+            "binaryDir": "${sourceDir}/build",
             "inherits": [
                 "common_configs"
             ],