diff --git a/.idea/cmake.xml b/.idea/cmake.xml
index 82607a3..31d74ea 100644
--- a/.idea/cmake.xml
+++ b/.idea/cmake.xml
@@ -2,11 +2,11 @@
 <project version="4">
   <component name="CMakeSharedSettings">
     <configurations>
-      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" NO_GENERATOR="true" />
+      <configuration PROFILE_NAME="Debug" ENABLED="true" GENERATION_DIR="cmake-build-debug" CONFIG_NAME="Debug" NO_GENERATOR="true" />
       <configuration PROFILE_NAME="Debug Linux" ENABLED="true" GENERATION_DIR="cmake-build-debug-linux" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_OSAL=linux" NO_GENERATOR="true" />
       <configuration PROFILE_NAME="Release" ENABLED="true" CONFIG_NAME="Release" NO_GENERATOR="true" />
       <configuration PROFILE_NAME="Debug Clang" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=cmake/ClangToolchain.cmake" />
-      <configuration PROFILE_NAME="Debug Test" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_BUILD_UNITTESTS=ON -DFSFW_OSAL=host" NO_GENERATOR="true" />
+      <configuration PROFILE_NAME="Debug Test" ENABLED="false" GENERATION_DIR="cmake-build-tests" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_BUILD_TESTS=ON -DFSFW_OSAL=host" NO_GENERATOR="true" />
     </configurations>
   </component>
 </project>
\ No newline at end of file
diff --git a/.run/fsfw-example-hosted.run.xml b/.run/fsfw-example-hosted.run.xml
deleted file mode 100644
index 563a820..0000000
--- a/.run/fsfw-example-hosted.run.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Debug Linux" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
-    <method v="2">
-      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/example_common b/example_common
index 8203995..43060b3 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 8203995deb087c0a51ce7ec7fdc0f0f4f21d06ce
+Subproject commit 43060b3be7114813947d82e6eca55d069181988d
diff --git a/fsfw b/fsfw
index 5a9db72..064b195 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 5a9db72814c7f085f91e40cec76e0831e1cd3e84
+Subproject commit 064b195c752f2f6e7c0cb4660bb294cf8a8e6db1