diff --git a/bsp_hosted/fsfwconfig/OBSWVersion.h b/bsp_hosted/fsfwconfig/OBSWVersion.h
index e1afa204..980b6965 100644
--- a/bsp_hosted/fsfwconfig/OBSWVersion.h
+++ b/bsp_hosted/fsfwconfig/OBSWVersion.h
@@ -3,8 +3,8 @@
const char* const SW_NAME = "eive";
-#define SW_VERSION 0
-#define SW_SUBVERSION 2
+#define SW_VERSION 1
+#define SW_SUBVERSION 0
#define SW_SUBSUBVERSION 0
diff --git a/cmake/scripts/Linux/create_cmake_debug_cfg.sh b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
index 5dff0fc7..1f75c12a 100755
--- a/cmake/scripts/Linux/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
@@ -16,5 +16,10 @@ fi
build_generator="Unix Makefiles"
os_fsfw="linux"
+builddir="Debug-Linux"
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug"
+echo "Running command (without the leading +):"
+set -x # Print command
+python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x
diff --git a/cmake/scripts/Linux/create_cmake_release_cfg.sh b/cmake/scripts/Linux/create_cmake_release_cfg.sh
index 914c4581..ffd85ae7 100755
--- a/cmake/scripts/Linux/create_cmake_release_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_release_cfg.sh
@@ -16,5 +16,10 @@ fi
build_generator="Unix Makefiles"
os_fsfw="linux"
+builddir="Release-Linux"
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release"
+echo "Running command (without the leading +):"
+set -x # Print command
+python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x
diff --git a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
index 3414d111..31376322 100755
--- a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
@@ -16,5 +16,10 @@ fi
build_generator="Unix Makefiles"
os_fsfw="linux"
+builddir="RelWithDeb-Linux"
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb"
+echo "Running command (without the leading +):"
+set -x # Print command
+python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x
diff --git a/misc/eclipse/Host/eive-linux-host-debug-cmake.launch b/misc/eclipse/Host/eive-linux-host-debug-cmake.launch
index e79e2e8d..268bdf33 100644
--- a/misc/eclipse/Host/eive-linux-host-debug-cmake.launch
+++ b/misc/eclipse/Host/eive-linux-host-debug-cmake.launch
@@ -18,7 +18,7 @@
-
+
diff --git a/misc/eclipse/make/Host/eive-linux-host-debug.launch b/misc/eclipse/make/Host/eive-linux-host-debug.launch
deleted file mode 100644
index f5ab1ac7..00000000
--- a/misc/eclipse/make/Host/eive-linux-host-debug.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/misc/eclipse/make/Host/eive-linux-host-release-cmake.launch b/misc/eclipse/make/Host/eive-linux-host-release-cmake.launch
deleted file mode 100644
index f2647a4f..00000000
--- a/misc/eclipse/make/Host/eive-linux-host-release-cmake.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/misc/eclipse/make/Host/eive-linux-host-release.launch b/misc/eclipse/make/Host/eive-linux-host-release.launch
deleted file mode 100644
index 7548f831..00000000
--- a/misc/eclipse/make/Host/eive-linux-host-release.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/misc/eclipse/make/Host/eive-mingw-debug.launch b/misc/eclipse/make/Host/eive-mingw-debug.launch
deleted file mode 100644
index 4ab7b736..00000000
--- a/misc/eclipse/make/Host/eive-mingw-debug.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/misc/eclipse/make/Host/eive-mingw-release.launch b/misc/eclipse/make/Host/eive-mingw-release.launch
deleted file mode 100644
index da2f47a9..00000000
--- a/misc/eclipse/make/Host/eive-mingw-release.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/testtasks/TestTask.cpp b/test/testtasks/TestTask.cpp
index 57abc758..86f4af38 100644
--- a/test/testtasks/TestTask.cpp
+++ b/test/testtasks/TestTask.cpp
@@ -68,7 +68,7 @@ gps_rx_data[] = ""
ReturnValue_t TestTask::performOneShotAction() {
#if OBSW_ADD_TEST_CODE == 1
- performLwgpsTest();
+ //performLwgpsTest();
#endif
return HasReturnvaluesIF::RETURN_OK;
}