diff --git a/tmtc/.idea/runConfigurations/PUS_Ping.xml b/tmtc/.idea/runConfigurations/PUS_Ping.xml
index 8cdd2f8..997a60f 100644
--- a/tmtc/.idea/runConfigurations/PUS_Ping.xml
+++ b/tmtc/.idea/runConfigurations/PUS_Ping.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s 17 -o 0 -l" />
+    <option name="PARAMETERS" value="-s 17 -o 0 -d 5" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/.idea/runConfigurations/PUS_Scheduler_Test.xml b/tmtc/.idea/runConfigurations/PUS_Scheduler_Test.xml
new file mode 100644
index 0000000..a77d100
--- /dev/null
+++ b/tmtc/.idea/runConfigurations/PUS_Scheduler_Test.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PUS Scheduler Test" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s 11 -o test-insert -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
index 57aeba3..6de31cc 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 57aeba3de0f09a83f6a94b71074d91aeb10c6b29
+Subproject commit 6de31ccd3f098c6beb5d2805c1149dd335d88bf2
diff --git a/tmtc/deps/tmtccmd b/tmtc/deps/tmtccmd
index 83ade50..c5bbb9c 160000
--- a/tmtc/deps/tmtccmd
+++ b/tmtc/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 83ade5003710caf7ee53f62614b36e5346d099ea
+Subproject commit c5bbb9cdfd74c81ee72d069a7ab519390ae62b51