IMAP-Science-Operations-Center · greglucas · Jan 9, 2024 · Jan 5, 2024
diff --git a/imap_processing/idex/idex_packet_parser.py b/imap_processing/idex/idex_packet_parser.py
@@ -46,7 +46,7 @@ class PacketParser:
     --------
         >>> # Print out the data in a L0 file
         >>> from imap_processing.idex.idex_packet_parser import PacketParser
-        >>> l0_file = "imap_processing/idex/tests/imap_idex_l0_20230725_v01-00.pkts"
+        >>> l0_file = "imap_processing/tests/idex/imap_idex_l0_20230725_v01-00.pkts"
         >>> l1_data = PacketParser(l0_file)
         >>> l1_data.write_l1_cdf()
 

diff --git a/imap_processing/cdf/tests/__init__.py → imap_processing/tests/cdf/__init__.py b/imap_processing/cdf/tests/__init__.py → imap_processing/tests/cdf/__init__.py
diff --git a/...processing/cdf/tests/test_attr_classes.py → ...processing/tests/cdf/test_attr_classes.py b/...processing/cdf/tests/test_attr_classes.py → ...processing/tests/cdf/test_attr_classes.py
diff --git a/imap_processing/codice/tests/__init__.py → imap_processing/tests/codice/__init__.py b/imap_processing/codice/tests/__init__.py → imap_processing/tests/codice/__init__.py
diff --git a/...odice/tests/data/eu_unit_lookup_table.csv → ...ests/codice/data/eu_unit_lookup_table.csv b/...odice/tests/data/eu_unit_lookup_table.csv → ...ests/codice/data/eu_unit_lookup_table.csv
diff --git a/...e_export_eu.COD_NHK_20230822_122700 2.csv → ...e_export_eu.COD_NHK_20230822_122700 2.csv b/...e_export_eu.COD_NHK_20230822_122700 2.csv → ...e_export_eu.COD_NHK_20230822_122700 2.csv
diff --git a/...le_export_raw.COD_NHK_20230822_122700.csv → ...le_export_raw.COD_NHK_20230822_122700.csv b/...le_export_raw.COD_NHK_20230822_122700.csv → ...le_export_raw.COD_NHK_20230822_122700.csv
diff --git a/.../data/raw_ccsds_20230822_122700Z_idle.bin → .../data/raw_ccsds_20230822_122700Z_idle.bin b/.../data/raw_ccsds_20230822_122700Z_idle.bin → .../data/raw_ccsds_20230822_122700Z_idle.bin
diff --git a/...processing/codice/tests/test_codice_l0.py → ...processing/tests/codice/test_codice_l0.py b/...processing/codice/tests/test_codice_l0.py → ...processing/tests/codice/test_codice_l0.py
@@ -24,7 +24,7 @@ def decom_test_data() -> list:
     """
 
     packet_file = Path(
-        f"{imap_module_directory}/codice/tests/data/"
+        f"{imap_module_directory}/tests/codice/data/"
         f"raw_ccsds_20230822_122700Z_idle.bin"
     )
     Path(f"{imap_module_directory}/codice/packet_definitions/P_COD_NHK.xml")
@@ -51,7 +51,7 @@ def validation_data() -> pd.core.frame.DataFrame:
 
     # Read in the CSV file
     validation_file = Path(
-        f"{imap_module_directory}/codice/tests/data/"
+        f"{imap_module_directory}/tests/codice/data/"
         f"idle_export_raw.COD_NHK_20230822_122700.csv"
     )
     validation_data = pd.read_csv(validation_file, index_col="SHCOARSE")
@@ -79,7 +79,7 @@ def test_eu_hk_data(
     l1a_hk_ds = create_dataset(decom_test_data)
     eu_hk_data = convert_raw_to_eu(
         l1a_hk_ds,
-        imap_module_directory / "codice/tests/data/eu_unit_lookup_table.csv",
+        imap_module_directory / "tests/codice/data/eu_unit_lookup_table.csv",
         "P_COD_NHK",
     )
     first_data = decom_test_data[0]

diff --git a/...rocessing/codice/tests/test_codice_l1a.py → ...rocessing/tests/codice/test_codice_l1a.py b/...rocessing/codice/tests/test_codice_l1a.py → ...rocessing/tests/codice/test_codice_l1a.py
@@ -21,7 +21,7 @@ def l0_test_data() -> list:
     """
 
     packet_file = Path(
-        f"{imap_module_directory}/codice/tests/data/"
+        f"{imap_module_directory}/tests/codice/data/"
         f"raw_ccsds_20230822_122700Z_idle.bin"
     )
     packets = decom_packets(packet_file)

diff --git a/...rocessing/codice/tests/test_decompress.py → ...rocessing/tests/codice/test_decompress.py b/...rocessing/codice/tests/test_decompress.py → ...rocessing/tests/codice/test_decompress.py
diff --git a/...tests/glows_test_packet_20110921_v01.pkts → ...glows/glows_test_packet_20110921_v01.pkts b/...tests/glows_test_packet_20110921_v01.pkts → ...glows/glows_test_packet_20110921_v01.pkts
diff --git a/...rocessing/glows/tests/test_glows_decom.py → ...rocessing/tests/glows/test_glows_decom.py b/...rocessing/glows/tests/test_glows_decom.py → ...rocessing/tests/glows/test_glows_decom.py
diff --git a/...essing/glows/tests/test_glows_l1a_data.py → ...essing/tests/glows/test_glows_l1a_data.py b/...essing/glows/tests/test_glows_l1a_data.py → ...essing/tests/glows/test_glows_l1a_data.py
diff --git a/imap_processing/hi/tests/__init__.py → imap_processing/tests/hi/__init__.py b/imap_processing/hi/tests/__init__.py → imap_processing/tests/hi/__init__.py
diff --git a/...sts/l0_test_data/20231030_H45_APP_NHK.bin → .../hi/l0_test_data/20231030_H45_APP_NHK.bin b/...sts/l0_test_data/20231030_H45_APP_NHK.bin → .../hi/l0_test_data/20231030_H45_APP_NHK.bin
diff --git a/...sts/l0_test_data/20231030_H45_SCI_CNT.bin → .../hi/l0_test_data/20231030_H45_SCI_CNT.bin b/...sts/l0_test_data/20231030_H45_SCI_CNT.bin → .../hi/l0_test_data/20231030_H45_SCI_CNT.bin
diff --git a/...ests/l0_test_data/20231030_H45_SCI_DE.bin → ...s/hi/l0_test_data/20231030_H45_SCI_DE.bin b/...ests/l0_test_data/20231030_H45_SCI_DE.bin → ...s/hi/l0_test_data/20231030_H45_SCI_DE.bin
diff --git a/...ocessing/hi/tests/l0_test_data/README.txt → ...ocessing/tests/hi/l0_test_data/README.txt b/...ocessing/hi/tests/l0_test_data/README.txt → ...ocessing/tests/hi/l0_test_data/README.txt
diff --git a/..._validation_data/20231030_H45_APP_NHK.csv → ..._validation_data/20231030_H45_APP_NHK.csv b/..._validation_data/20231030_H45_APP_NHK.csv → ..._validation_data/20231030_H45_APP_NHK.csv
diff --git a/imap_processing/hi/tests/test_decom.py → imap_processing/tests/hi/test_decom.py b/imap_processing/hi/tests/test_decom.py → imap_processing/tests/hi/test_decom.py
@@ -8,7 +8,7 @@
 @pytest.fixture(scope="session")
 def decom_nhk_data():
     """Read test housekeeping data from test folder"""
-    test_folder_path = "hi/tests/l0_test_data"
+    test_folder_path = "tests/hi/l0_test_data"
     packet_file = imap_module_directory / f"{test_folder_path}/20231030_H45_APP_NHK.bin"
     packet_def_file = imap_module_directory / "hi/packet_definitions/H45_APP_NHK.xml"
     return decom_packets(packet_file, packet_def_file)
@@ -17,7 +17,7 @@ def decom_nhk_data():
 @pytest.fixture(scope="session")
 def nhk_validation_data():
     """Read in validation data from the CSV file"""
-    test_data_path = imap_module_directory / "hi/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/hi/l0_validation_data"
     raw_validation_data = pd.read_csv(
         test_data_path / "20231030_H45_APP_NHK.csv",
         index_col="CCSDS_MET",
@@ -28,7 +28,7 @@ def nhk_validation_data():
 @pytest.fixture(scope="session")
 def decom_sci_de_data():
     """Read science direct event data from test folder"""
-    test_folder_path = "hi/tests/l0_test_data"
+    test_folder_path = "tests/hi/l0_test_data"
     packet_file = imap_module_directory / f"{test_folder_path}/20231030_H45_SCI_DE.bin"
     packet_def_file = imap_module_directory / "hi/packet_definitions/H45_SCI_DE.xml"
     return decom_packets(packet_file, packet_def_file)
@@ -37,7 +37,7 @@ def decom_sci_de_data():
 @pytest.fixture(scope="session")
 def decom_sci_cnt_data():
     """Read science count data from test folder"""
-    test_folder_path = "hi/tests/l0_test_data"
+    test_folder_path = "tests/hi/l0_test_data"
     packet_file = imap_module_directory / f"{test_folder_path}/20231030_H45_SCI_CNT.bin"
     packet_def_file = imap_module_directory / "hi/packet_definitions/H45_SCI_CNT.xml"
     return decom_packets(packet_file, packet_def_file)

diff --git a/...aw_record_2023_256_15_59_04_apid1251.pkts → ...aw_record_2023_256_15_59_04_apid1251.pkts b/...aw_record_2023_256_15_59_04_apid1251.pkts → ...aw_record_2023_256_15_59_04_apid1251.pkts
diff --git a/...aw_record_2023_256_15_59_04_apid1252.pkts → ...aw_record_2023_256_15_59_04_apid1252.pkts b/...aw_record_2023_256_15_59_04_apid1252.pkts → ...aw_record_2023_256_15_59_04_apid1252.pkts
diff --git a/imap_processing/hit/tests/__init__.py → imap_processing/tests/hit/__init__.py b/imap_processing/hit/tests/__init__.py → imap_processing/tests/hit/__init__.py
diff --git a/imap_processing/hit/tests/test_hit_decom.py → imap_processing/tests/hit/test_hit_decom.py b/imap_processing/hit/tests/test_hit_decom.py → imap_processing/tests/hit/test_hit_decom.py
@@ -7,7 +7,7 @@
 def decom_test_data():
     """Read test data from file"""
     packet_file = (
-        "imap_processing/hit/tests/PREFLIGHT_raw_record_2023_256_15_59_04_apid1251.pkts"
+        "imap_processing/tests/hit/PREFLIGHT_raw_record_2023_256_15_59_04_apid1251.pkts"
     )
     xtce = "imap_processing/hit/packet_definitions/P_HIT_HSKP.xml"
     data_packet_list = hit_l1a_decom.decom_hit_packets(packet_file, xtce)

diff --git a/imap_processing/ialirt/tests/__init__.py → imap_processing/tests/ialirt/__init__.py b/imap_processing/ialirt/tests/__init__.py → imap_processing/tests/ialirt/__init__.py
diff --git a/...t_data/l0/IALiRT Raw Packet Telemetry.txt → ...t_data/l0/IALiRT Raw Packet Telemetry.txt b/...t_data/l0/IALiRT Raw Packet Telemetry.txt → ...t_data/l0/IALiRT Raw Packet Telemetry.txt
diff --git a/..._processing/ialirt/tests/unit/__init__.py → ..._processing/tests/ialirt/unit/__init__.py b/..._processing/ialirt/tests/unit/__init__.py → ..._processing/tests/ialirt/unit/__init__.py
diff --git a/...ng/ialirt/tests/unit/test_decom_ialirt.py → ...ng/tests/ialirt/unit/test_decom_ialirt.py b/...ng/ialirt/tests/unit/test_decom_ialirt.py → ...ng/tests/ialirt/unit/test_decom_ialirt.py
@@ -22,8 +22,8 @@ def binary_packet_path(tmp_path):
     """
     packet_path = (
         imap_module_directory
-        / "ialirt"
         / "tests"
+        / "ialirt"
         / "test_data"
         / "l0"
         / "IALiRT Raw Packet Telemetry.txt"

diff --git a/imap_processing/idex/tests/__init__.py → imap_processing/tests/idex/__init__.py b/imap_processing/idex/tests/__init__.py → imap_processing/tests/idex/__init__.py
diff --git a/...x/tests/imap_idex_l0_20230725_v01-00.pkts → ...ts/idex/imap_idex_l0_20230725_v01-00.pkts b/...x/tests/imap_idex_l0_20230725_v01-00.pkts → ...ts/idex/imap_idex_l0_20230725_v01-00.pkts
diff --git a/...ng/idex/tests/impact_14_tof_high_data.txt → ...ng/tests/idex/impact_14_tof_high_data.txt b/...ng/idex/tests/impact_14_tof_high_data.txt → ...ng/tests/idex/impact_14_tof_high_data.txt
diff --git a/imap_processing/idex/tests/test_decom.py → imap_processing/tests/idex/test_decom.py b/imap_processing/idex/tests/test_decom.py → imap_processing/tests/idex/test_decom.py
@@ -6,7 +6,7 @@
 
 @pytest.fixture(scope="session")
 def decom_test_data():
-    return PacketParser("imap_processing/idex/tests/imap_idex_l0_20230725_v01-00.pkts")
+    return PacketParser("imap_processing/tests/idex/imap_idex_l0_20230725_v01-00.pkts")
 
 
 def test_idex_decom_length(decom_test_data):
@@ -23,6 +23,6 @@ def test_idex_decom_event_num(decom_test_data):
 def test_idex_tof_high_data(decom_test_data):
     # Verify that a sample of the data is correct
     # impact_14_tof_high_data.txt has been verified correct by the IDEX team
-    with open("imap_processing/idex/tests/impact_14_tof_high_data.txt") as f:
+    with open("imap_processing/tests/idex/impact_14_tof_high_data.txt") as f:
         data = np.array([int(line.rstrip("\n")) for line in f])
     assert (decom_test_data.data["TOF_High"][13].data == data).all()
diff --git a/imap_processing/idex/tests/test_l1_cdfs.py → imap_processing/tests/idex/test_l1_cdfs.py b/imap_processing/idex/tests/test_l1_cdfs.py → imap_processing/tests/idex/test_l1_cdfs.py
@@ -14,7 +14,7 @@
 
 @pytest.fixture()
 def decom_test_data():
-    return PacketParser("imap_processing/idex/tests/imap_idex_l0_20230725_v01-00.pkts")
+    return PacketParser("imap_processing/tests/idex/imap_idex_l0_20230725_v01-00.pkts")
 
 
 @pytest.fixture()
@@ -85,7 +85,7 @@ def test_descriptor_in_file_name(decom_test_data, temp_path):
 def test_idex_tof_high_data_from_cdf(decom_test_data, temp_path):
     # Verify that a sample of the data is correct inside the CDF file
     # impact_14_tof_high_data.txt has been verified correct by the IDEX team
-    with open("imap_processing/idex/tests/impact_14_tof_high_data.txt") as f:
+    with open("imap_processing/tests/idex/impact_14_tof_high_data.txt") as f:
         data = np.array([int(line.rstrip()) for line in f])
 
     file_name = write_cdf(decom_test_data.data, description="", directory=temp_path)

diff --git a/imap_processing/swe/tests/__init__.py → imap_processing/tests/swe/__init__.py b/imap_processing/swe/tests/__init__.py → imap_processing/tests/swe/__init__.py
diff --git a/...230927173238_4th_quarter_decompressed.csv → ...230927173238_4th_quarter_decompressed.csv b/...230927173238_4th_quarter_decompressed.csv → ...230927173238_4th_quarter_decompressed.csv
diff --git a/...230927173253_1st_quarter_decompressed.csv → ...230927173253_1st_quarter_decompressed.csv b/...230927173253_1st_quarter_decompressed.csv → ...230927173253_1st_quarter_decompressed.csv
diff --git a/...230927173308_2nd_quarter_decompressed.csv → ...230927173308_2nd_quarter_decompressed.csv b/...230927173308_2nd_quarter_decompressed.csv → ...230927173308_2nd_quarter_decompressed.csv
diff --git a/...230927173323_3rd_quarter_decompressed.csv → ...230927173323_3rd_quarter_decompressed.csv b/...230927173323_3rd_quarter_decompressed.csv → ...230927173323_3rd_quarter_decompressed.csv
diff --git a/.../l0_data/20230927100248_SWE_HK_packet.bin → .../l0_data/20230927100248_SWE_HK_packet.bin b/.../l0_data/20230927100248_SWE_HK_packet.bin → .../l0_data/20230927100248_SWE_HK_packet.bin
diff --git a/.../l0_data/20230927100412_SWE_HK_packet.bin → .../l0_data/20230927100412_SWE_HK_packet.bin b/.../l0_data/20230927100412_SWE_HK_packet.bin → .../l0_data/20230927100412_SWE_HK_packet.bin
diff --git a/...ata/20230927100425_SWE_CEM_RAW_packet.bin → ...ata/20230927100425_SWE_CEM_RAW_packet.bin b/...ata/20230927100425_SWE_CEM_RAW_packet.bin → ...ata/20230927100425_SWE_CEM_RAW_packet.bin
diff --git a/...ata/20230927100426_SWE_CEM_RAW_packet.bin → ...ata/20230927100426_SWE_CEM_RAW_packet.bin b/...ata/20230927100426_SWE_CEM_RAW_packet.bin → ...ata/20230927100426_SWE_CEM_RAW_packet.bin
diff --git a/...ata/20230927173238_SWE_SCIENCE_packet.bin → ...ata/20230927173238_SWE_SCIENCE_packet.bin b/...ata/20230927173238_SWE_SCIENCE_packet.bin → ...ata/20230927173238_SWE_SCIENCE_packet.bin
diff --git a/...ata/20230927173253_SWE_SCIENCE_packet.bin → ...ata/20230927173253_SWE_SCIENCE_packet.bin b/...ata/20230927173253_SWE_SCIENCE_packet.bin → ...ata/20230927173253_SWE_SCIENCE_packet.bin
diff --git a/...ata/20230927173308_SWE_SCIENCE_packet.bin → ...ata/20230927173308_SWE_SCIENCE_packet.bin b/...ata/20230927173308_SWE_SCIENCE_packet.bin → ...ata/20230927173308_SWE_SCIENCE_packet.bin
diff --git a/...ata/20230927173323_SWE_SCIENCE_packet.bin → ...ata/20230927173323_SWE_SCIENCE_packet.bin b/...ata/20230927173323_SWE_SCIENCE_packet.bin → ...ata/20230927173323_SWE_SCIENCE_packet.bin
diff --git a/...data/20231004155854_SWE_EVTMSG_packet.bin → ...data/20231004155854_SWE_EVTMSG_packet.bin b/...data/20231004155854_SWE_EVTMSG_packet.bin → ...data/20231004155854_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004155904_SWE_EVTMSG_packet.bin → ...data/20231004155904_SWE_EVTMSG_packet.bin b/...data/20231004155904_SWE_EVTMSG_packet.bin → ...data/20231004155904_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004155905_SWE_EVTMSG_packet.bin → ...data/20231004155905_SWE_EVTMSG_packet.bin b/...data/20231004155905_SWE_EVTMSG_packet.bin → ...data/20231004155905_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004155919_SWE_EVTMSG_packet.bin → ...data/20231004155919_SWE_EVTMSG_packet.bin b/...data/20231004155919_SWE_EVTMSG_packet.bin → ...data/20231004155919_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004155956_SWE_EVTMSG_packet.bin → ...data/20231004155956_SWE_EVTMSG_packet.bin b/...data/20231004155956_SWE_EVTMSG_packet.bin → ...data/20231004155956_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160009_SWE_EVTMSG_packet.bin → ...data/20231004160009_SWE_EVTMSG_packet.bin b/...data/20231004160009_SWE_EVTMSG_packet.bin → ...data/20231004160009_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160010_SWE_EVTMSG_packet.bin → ...data/20231004160010_SWE_EVTMSG_packet.bin b/...data/20231004160010_SWE_EVTMSG_packet.bin → ...data/20231004160010_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160020_SWE_EVTMSG_packet.bin → ...data/20231004160020_SWE_EVTMSG_packet.bin b/...data/20231004160020_SWE_EVTMSG_packet.bin → ...data/20231004160020_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160021_SWE_EVTMSG_packet.bin → ...data/20231004160021_SWE_EVTMSG_packet.bin b/...data/20231004160021_SWE_EVTMSG_packet.bin → ...data/20231004160021_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160022_SWE_EVTMSG_packet.bin → ...data/20231004160022_SWE_EVTMSG_packet.bin b/...data/20231004160022_SWE_EVTMSG_packet.bin → ...data/20231004160022_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160024_SWE_EVTMSG_packet.bin → ...data/20231004160024_SWE_EVTMSG_packet.bin b/...data/20231004160024_SWE_EVTMSG_packet.bin → ...data/20231004160024_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160027_SWE_EVTMSG_packet.bin → ...data/20231004160027_SWE_EVTMSG_packet.bin b/...data/20231004160027_SWE_EVTMSG_packet.bin → ...data/20231004160027_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160030_SWE_EVTMSG_packet.bin → ...data/20231004160030_SWE_EVTMSG_packet.bin b/...data/20231004160030_SWE_EVTMSG_packet.bin → ...data/20231004160030_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160033_SWE_EVTMSG_packet.bin → ...data/20231004160033_SWE_EVTMSG_packet.bin b/...data/20231004160033_SWE_EVTMSG_packet.bin → ...data/20231004160033_SWE_EVTMSG_packet.bin
diff --git a/...data/20231004160034_SWE_EVTMSG_packet.bin → ...data/20231004160034_SWE_EVTMSG_packet.bin b/...data/20231004160034_SWE_EVTMSG_packet.bin → ...data/20231004160034_SWE_EVTMSG_packet.bin
diff --git a/...ta_derived.SWE_APP_HK_20230927_094839.csv → ...ta_derived.SWE_APP_HK_20230927_094839.csv b/...ta_derived.SWE_APP_HK_20230927_094839.csv → ...ta_derived.SWE_APP_HK_20230927_094839.csv
diff --git a/...a/data_raw.SWE_APP_HK_20230927_094839.csv → ...a/data_raw.SWE_APP_HK_20230927_094839.csv b/...a/data_raw.SWE_APP_HK_20230927_094839.csv → ...a/data_raw.SWE_APP_HK_20230927_094839.csv
diff --git a/.../data_raw.SWE_CEM_RAW_20230927_094839.csv → .../data_raw.SWE_CEM_RAW_20230927_094839.csv b/.../data_raw.SWE_CEM_RAW_20230927_094839.csv → .../data_raw.SWE_CEM_RAW_20230927_094839.csv
diff --git a/...export_eu.SWE_EVTMSG_20231004_140149.xlsx → ...export_eu.SWE_EVTMSG_20231004_140149.xlsx b/...export_eu.SWE_EVTMSG_20231004_140149.xlsx → ...export_eu.SWE_EVTMSG_20231004_140149.xlsx
diff --git a/...export_eu.SWE_SCIENCE_20230927_172708.csv → ...export_eu.SWE_SCIENCE_20230927_172708.csv b/...export_eu.SWE_SCIENCE_20230927_172708.csv → ...export_eu.SWE_SCIENCE_20230927_172708.csv
diff --git a/...export_raw.SWE_EVTMSG_20231004_140149.csv → ...export_raw.SWE_EVTMSG_20231004_140149.csv b/...export_raw.SWE_EVTMSG_20231004_140149.csv → ...export_raw.SWE_EVTMSG_20231004_140149.csv
diff --git a/...xport_raw.SWE_SCIENCE_20230927_172708.csv → ...xport_raw.SWE_SCIENCE_20230927_172708.csv b/...xport_raw.SWE_SCIENCE_20230927_172708.csv → ...xport_raw.SWE_SCIENCE_20230927_172708.csv
diff --git a/imap_processing/swe/tests/test_swe_l1a.py → imap_processing/tests/swe/test_swe_l1a.py b/imap_processing/swe/tests/test_swe_l1a.py → imap_processing/tests/swe/test_swe_l1a.py
@@ -14,7 +14,7 @@
 @pytest.fixture(scope="session")
 def decom_test_data():
     """Read test data from test folder"""
-    test_folder_path = "swe/tests/l0_data"
+    test_folder_path = "tests/swe/l0_data"
     packet_files = list(imap_module_directory.glob(f"{test_folder_path}/*.bin"))
 
     data_list = []

diff --git a/...cessing/swe/tests/test_swe_l1a_cem_raw.py → ...cessing/tests/swe/test_swe_l1a_cem_raw.py b/...cessing/swe/tests/test_swe_l1a_cem_raw.py → ...cessing/tests/swe/test_swe_l1a_cem_raw.py
@@ -8,7 +8,7 @@
 @pytest.fixture(scope="session")
 def decom_test_data():
     """Read test data from file"""
-    test_folder_path = imap_module_directory / "swe/tests/l0_data"
+    test_folder_path = imap_module_directory / "tests/swe/l0_data"
     packet_1_file = test_folder_path / "20230927100425_SWE_CEM_RAW_packet.bin"
     packet_2_file = test_folder_path / "20230927100426_SWE_CEM_RAW_packet.bin"
     first_data = decom_swe.decom_packets(packet_1_file)
@@ -26,7 +26,7 @@ def test_number_of_packets(decom_test_data):
 def test_swe_raw_cem_data(decom_test_data):
     """This test and validate raw data of SWE raw CEM data."""
     # read validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
     raw_validation_data = pd.read_csv(
         test_data_path / "data_raw.SWE_CEM_RAW_20230927_094839.csv",
         index_col="SHCOARSE",

diff --git a/...ssing/swe/tests/test_swe_l1a_event_msg.py → ...ssing/tests/swe/test_swe_l1a_event_msg.py b/...ssing/swe/tests/test_swe_l1a_event_msg.py → ...ssing/tests/swe/test_swe_l1a_event_msg.py
@@ -8,7 +8,7 @@
 @pytest.fixture(scope="session")
 def decom_test_data():
     """Read test data from file"""
-    test_folder_path = "swe/tests/l0_data"
+    test_folder_path = "tests/swe/l0_data"
     event_file_list = list(
         imap_module_directory.glob(f"{test_folder_path}/*SWE_EVTMSG_packet.bin")
     )
@@ -28,7 +28,7 @@ def test_number_of_packets(decom_test_data):
 def test_swe_event_msg_data(decom_test_data):
     """This test and validate raw data of SWE event message data."""
     # read validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
 
     raw_validation_data = pd.read_csv(
         test_data_path / "idle_export_raw.SWE_EVTMSG_20231004_140149.csv",

diff --git a/...ng/swe/tests/test_swe_l1a_housekeeping.py → ...ng/tests/swe/test_swe_l1a_housekeeping.py b/...ng/swe/tests/test_swe_l1a_housekeeping.py → ...ng/tests/swe/test_swe_l1a_housekeeping.py
@@ -9,10 +9,10 @@
 def decom_test_data():
     """Read test data from file"""
     packet_1_file = (
-        imap_module_directory / "swe/tests/l0_data/20230927100248_SWE_HK_packet.bin"
+        imap_module_directory / "tests/swe/l0_data/20230927100248_SWE_HK_packet.bin"
     )
     packet_2_file = (
-        imap_module_directory / "swe/tests/l0_data/20230927100412_SWE_HK_packet.bin"
+        imap_module_directory / "tests/swe/l0_data/20230927100412_SWE_HK_packet.bin"
     )
     first_data = decom_swe.decom_packets(packet_1_file)
     second_data = decom_swe.decom_packets(packet_2_file)
@@ -29,7 +29,7 @@ def test_number_of_packets(decom_test_data):
 def test_swe_raw_housekeeping_data(decom_test_data):
     """This test and validate raw and derived data of SWE housekeeping data."""
     # read validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
     raw_validation_data = pd.read_csv(
         test_data_path / "data_raw.SWE_APP_HK_20230927_094839.csv",
         index_col="SHCOARSE",
@@ -51,7 +51,7 @@ def test_swe_raw_housekeeping_data(decom_test_data):
 def test_swe_derived_housekeeping_data(decom_test_data):
     """This test and validate derived data of SWE housekeeping data."""
     # read validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
     derived_validation_data = pd.read_csv(
         test_data_path / "data_derived.SWE_APP_HK_20230927_094839.csv",
         index_col="SHCOARSE",

diff --git a/...cessing/swe/tests/test_swe_l1a_science.py → ...cessing/tests/swe/test_swe_l1a_science.py b/...cessing/swe/tests/test_swe_l1a_science.py → ...cessing/tests/swe/test_swe_l1a_science.py
@@ -19,13 +19,13 @@ def decom_test_data():
     # reorder to match the order of spin in the data
     packet_files = [
         imap_module_directory
-        / "swe/tests/l0_data/20230927173253_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173253_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173308_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173308_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173323_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173323_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173238_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173238_SWE_SCIENCE_packet.bin",
     ]
     data_list = []
     for packet_file in packet_files:
@@ -50,7 +50,7 @@ def test_decompress_algorithm():
 def test_swe_raw_science_data(decom_test_data):
     """This test and validate raw and derived data of SWE science data."""
     # read validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
     raw_validation_data = pd.read_csv(
         test_data_path / "idle_export_raw.SWE_SCIENCE_20230927_172708.csv",
         index_col="SHCOARSE",
@@ -74,7 +74,7 @@ def test_swe_raw_science_data(decom_test_data):
 def test_swe_derived_science_data(decom_test_data):
     """This test and validate raw and derived data of SWE science data."""
     # read validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
     derived_validation_data = pd.read_csv(
         test_data_path / "idle_export_eu.SWE_SCIENCE_20230927_172708.csv",
         index_col="SHCOARSE",
@@ -132,7 +132,7 @@ def test_swe_science_algorithm(decom_test_data):
 
 def test_decompress_counts(decom_test_data):
     """Test decompress counts."""
-    test_data_path = imap_module_directory / "swe/tests/decompressed"
+    test_data_path = imap_module_directory / "tests/swe/decompressed"
     filepaths = [
         "20230927173253_1st_quarter_decompressed.csv",
         "20230927173308_2nd_quarter_decompressed.csv",

diff --git a/imap_processing/swe/tests/test_swe_l1b.py → imap_processing/tests/swe/test_swe_l1b.py b/imap_processing/swe/tests/test_swe_l1b.py → imap_processing/tests/swe/test_swe_l1b.py
@@ -19,7 +19,7 @@
 @pytest.fixture(scope="session")
 def decom_test_data():
     """Read test data from test folder"""
-    test_folder_path = "swe/tests/l0_data"
+    test_folder_path = "tests/swe/l0_data"
     packet_files = list(imap_module_directory.glob(f"{test_folder_path}/*.bin"))
 
     data_list = []
@@ -40,13 +40,13 @@ def l1a_test_data():
     # moved packet 1 to bottom to show data in order.
     packet_files = [
         imap_module_directory
-        / "swe/tests/l0_data/20230927173253_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173253_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173308_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173308_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173323_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173323_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173238_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173238_SWE_SCIENCE_packet.bin",
     ]
     data = []
     for packet_file in packet_files:
@@ -90,7 +90,7 @@ def test_swe_l1b(decom_test_data):
     )
 
     # read science validation data
-    test_data_path = imap_module_directory / "swe/tests/l0_validation_data"
+    test_data_path = imap_module_directory / "tests/swe/l0_validation_data"
     eu_validation_data = pd.read_csv(
         test_data_path / "idle_export_eu.SWE_SCIENCE_20230927_172708.csv",
         index_col="SHCOARSE",

diff --git a/...cessing/swe/tests/test_swe_l1b_science.py → ...cessing/tests/swe/test_swe_l1b_science.py b/...cessing/swe/tests/test_swe_l1b_science.py → ...cessing/tests/swe/test_swe_l1b_science.py
@@ -21,13 +21,13 @@ def l1a_test_data():
     # moved packet 1 to bottom to show data in order.
     packet_files = [
         imap_module_directory
-        / "swe/tests/l0_data/20230927173253_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173253_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173308_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173308_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173323_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173323_SWE_SCIENCE_packet.bin",
         imap_module_directory
-        / "swe/tests/l0_data/20230927173238_SWE_SCIENCE_packet.bin",
+        / "tests/swe/l0_data/20230927173238_SWE_SCIENCE_packet.bin",
     ]
     data = []
     for packet_file in packet_files:

diff --git a/imap_processing/ultra/tests/__init__.py → imap_processing/tests/ultra/__init__.py b/imap_processing/ultra/tests/__init__.py → imap_processing/tests/ultra/__init__.py
diff --git a/..._Cal_Run7_ThetaScan_20220530T225054.CCSDS → ..._Cal_Run7_ThetaScan_20220530T225054.CCSDS b/..._Cal_Run7_ThetaScan_20220530T225054.CCSDS → ..._Cal_Run7_ThetaScan_20220530T225054.CCSDS
diff --git a/...RI_Cal_Run7_ThetaScan_20220530T225054.csv → ...RI_Cal_Run7_ThetaScan_20220530T225054.csv b/...RI_Cal_Run7_ThetaScan_20220530T225054.csv → ...RI_Cal_Run7_ThetaScan_20220530T225054.csv
diff --git a/...RI_Cal_Run7_ThetaScan_20220530T225054.csv → ...RI_Cal_Run7_ThetaScan_20220530T225054.csv b/...RI_Cal_Run7_ThetaScan_20220530T225054.csv → ...RI_Cal_Run7_ThetaScan_20220530T225054.csv
diff --git a/imap_processing/ultra/tests/unit/__init__.py → imap_processing/tests/ultra/unit/__init__.py b/imap_processing/ultra/tests/unit/__init__.py → imap_processing/tests/ultra/unit/__init__.py
diff --git a/imap_processing/ultra/tests/unit/conftest.py → imap_processing/tests/ultra/unit/conftest.py b/imap_processing/ultra/tests/unit/conftest.py → imap_processing/tests/ultra/unit/conftest.py
@@ -10,8 +10,8 @@ def ccsds_path():
     """Returns the ccsds directory."""
     return (
         Path(sys.modules[__name__.split(".")[0]].__file__).parent
-        / "ultra"
         / "tests"
+        / "ultra"
         / "test_data"
         / "l0"
         / "Ultra45_EM_SwRI_Cal_Run7_ThetaScan_20220530T225054.CCSDS"
@@ -60,8 +60,8 @@ def xtce_image_rates_test_path():
     )
     return (
         Path(sys.modules[__name__.split(".")[0]].__file__).parent
-        / "ultra"
         / "tests"
+        / "ultra"
         / "test_data"
         / "l0"
         / filename
@@ -77,8 +77,8 @@ def xtce_aux_test_path():
     )
     return (
         Path(sys.modules[__name__.split(".")[0]].__file__).parent
-        / "ultra"
         / "tests"
+        / "ultra"
         / "test_data"
         / "l0"
         / filename

diff --git a/...g/ultra/tests/unit/test_decom_apid_880.py → ...g/tests/ultra/unit/test_decom_apid_880.py b/...g/ultra/tests/unit/test_decom_apid_880.py → ...g/tests/ultra/unit/test_decom_apid_880.py
diff --git a/...g/ultra/tests/unit/test_decom_apid_881.py → ...g/tests/ultra/unit/test_decom_apid_881.py b/...g/ultra/tests/unit/test_decom_apid_881.py → ...g/tests/ultra/unit/test_decom_apid_881.py