diff --git a/Cachyos/Scripts/WIP/emu/cia_3ds_decryptor.py b/Cachyos/Scripts/WIP/emu/cia_3ds_decryptor.py
index 3ca77e45..8b75d198 100644
--- a/Cachyos/Scripts/WIP/emu/cia_3ds_decryptor.py
+++ b/Cachyos/Scripts/WIP/emu/cia_3ds_decryptor.py
@@ -160,7 +160,7 @@ def parse_ctrtool_output(text: str) -> TitleInfo:
   for line in text.splitlines():
     if not info.title_id and (m := TITLE_ID_RE.search(line)):
       info.title_id = m.group(1)
-    if not info.title_version and (m := TITLE_VERSION_RE.search(line)):
+    if (m := TITLE_VERSION_RE.search(line)):
       info.title_version = m.group(1)
     if not info.crypto_key and "Crypto Key" in line:
       info.crypto_key = line.strip()
@@ -172,7 +172,7 @@ def parse_twl_ctrtool_output(text: str) -> TitleInfo:
   for line in text.splitlines():
     if not info.title_id and (m := TWL_TITLE_ID_RE.search(line)):
       info.title_id = m.group(1)
-    if not info.title_version and (m := TITLE_VERSION_RE.search(line)):
+    if (m := TITLE_VERSION_RE.search(line)):
       info.title_version = m.group(1)
     if not info.crypto_key and (m := TWL_ENCRYPTED_RE.search(line)):
       info.crypto_key = m.group(1)
diff --git a/Cachyos/Scripts/WIP/emu/test_decryptor_parser.py b/Cachyos/Scripts/WIP/emu/test_decryptor_parser.py
new file mode 100644
index 00000000..1fb09d03
--- /dev/null
+++ b/Cachyos/Scripts/WIP/emu/test_decryptor_parser.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+import importlib.util
+import unittest
+import sys
+from pathlib import Path
+
+# Dynamically import cia_3ds_decryptor.py
+file_path = Path(__file__).parent / "cia_3ds_decryptor.py"
+spec = importlib.util.spec_from_file_location("cia_3ds_decryptor", str(file_path))
+if spec is None:
+    raise ImportError(f"Could not load {file_path}")
+decryptor = importlib.util.module_from_spec(spec)
+sys.modules["cia_3ds_decryptor"] = decryptor
+spec.loader.exec_module(decryptor)
+
+class TestParser(unittest.TestCase):
+    def test_parse_ctrtool_output_full(self):
+        text = """
+Title id:                0004000000000100
+TitleVersion:            10
+Crypto Key:              Secure
+"""
+        info = decryptor.parse_ctrtool_output(text)
+        self.assertEqual(info.title_id, "0004000000000100")
+        self.assertEqual(info.title_version, "10")
+        self.assertEqual(info.crypto_key, "Crypto Key:              Secure")
+
+    def test_parse_ctrtool_output_partial(self):
+        text = "Title id: 0004000000000100"
+        info = decryptor.parse_ctrtool_output(text)
+        self.assertEqual(info.title_id, "0004000000000100")
+        self.assertEqual(info.title_version, "0")
+        self.assertEqual(info.crypto_key, "")
+
+    def test_parse_ctrtool_output_empty(self):
+        info = decryptor.parse_ctrtool_output("")
+        self.assertEqual(info.title_id, "")
+        self.assertEqual(info.title_version, "0")
+        self.assertEqual(info.crypto_key, "")
+
+    def test_parse_twl_ctrtool_output_full(self):
+        text = """
+TitleId:                 0004800000000100
+TitleVersion:            5
+Encrypted:               YES
+"""
+        info = decryptor.parse_twl_ctrtool_output(text)
+        self.assertEqual(info.title_id, "0004800000000100")
+        self.assertEqual(info.title_version, "5")
+        self.assertEqual(info.crypto_key, "YES")
+
+    def test_sanitize_filename(self):
+        self.assertEqual(decryptor.sanitize_filename("Game Name (USA)!?.cia"), "Game Name USA.cia")
+        self.assertEqual(decryptor.sanitize_filename("valid_name-123.3ds"), "valid_name-123.3ds")
+        # Test that it preserves case (if TRANSLATE_TABLE is correct)
+        self.assertEqual(decryptor.sanitize_filename("UPPERCASE.CIA"), "UPPERCASE.CIA")
+        # If all characters are invalid, it returns the original string
+        self.assertEqual(decryptor.sanitize_filename("!!!"), "!!!")
+
+if __name__ == '__main__':
+    unittest.main()