diff --git a/.run/CFDP Test File Small.run.xml b/.run/CFDP Test File Small No Closure.run.xml
similarity index 83%
rename from .run/CFDP Test File Small.run.xml
rename to .run/CFDP Test File Small No Closure.run.xml
index a3d3079..3c0688a 100644
--- a/.run/CFDP Test File Small.run.xml	
+++ b/.run/CFDP Test File Small No Closure.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CFDP Test File Small" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+  <configuration default="false" name="CFDP Test File Small No Closure" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -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="cfdp filetest/cfdp_test.txt /tmp/cfdp_test.txt -d 0.2" />
+    <option name="PARAMETERS" value="cfdp filetest/cfdp_test.txt /tmp/cfdp_test.txt --no-closure -d 0.2" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/config/definitions.py b/config/definitions.py
index f905724..ec917eb 100644
--- a/config/definitions.py
+++ b/config/definitions.py
@@ -9,8 +9,8 @@ import enum
 from spacepackets.util import UnsignedByteField
 
 PUS_APID = 0x65
-SPACE_PACKET_IDS = (0x08 << 8 | PUS_APID,)
 CFDP_APID = 0x66
+SPACE_PACKET_IDS = (0x08 << 8 | PUS_APID, 0x08 << 8 | CFDP_APID,)
 
 CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)
 CFDP_REMOTE_ENTITY_ID = UnsignedByteField(byte_len=2, val=CFDP_APID)