2 files changed, 25 insertions, 2 deletions
diff --git a/kernel/include/kernel/test_support/devices/storage/management.hpp b/kernel/include/kernel/test_support/devices/storage/management.hpp
index 7c0d304..581aa91 100644
--- a/kernel/include/kernel/test_support/devices/storage/management.hpp
+++ b/kernel/include/kernel/test_support/devices/storage/management.hpp
@@ -1,10 +1,10 @@
 #ifndef TEACHOS_KERNEL_TEST_SUPPORT_DEVICES_STORAGE_MANAGEMENT_HPP
 #define TEACHOS_KERNEL_TEST_SUPPORT_DEVICES_STORAGE_MANAGEMENT_HPP
 
-namespace kernel::tests::devices::storage
+namespace kernel::tests::devices::storage::management
 {
   //! Deinitialize the storage management singleton.
   auto deinit() -> void;
-}  // namespace kernel::tests::devices::storage
+}  // namespace kernel::tests::devices::storage::management
 
 #endif
 \ No newline at end of file
diff --git a/kernel/include/kernel/test_support/filesystem/storage_boot_module_fixture.hpp b/kernel/include/kernel/test_support/filesystem/storage_boot_module_fixture.hpp
new file mode 100644
index 0000000..a57659b
--- /dev/null
+++ b/kernel/include/kernel/test_support/filesystem/storage_boot_module_fixture.hpp
@@ -0,0 +1,23 @@
+#ifndef TEACHOS_KERNEL_TEST_SUPPORT_FILESYSTEM_STORAGE_BOOT_MODULE_FIXTURE_HPP
+#define TEACHOS_KERNEL_TEST_SUPPORT_FILESYSTEM_STORAGE_BOOT_MODULE_FIXTURE_HPP
+
+#include "kapi/boot_module/boot_module_registry.hpp"
+
+#include <cstddef>
+#include <string>
+#include <vector>
+
+namespace kernel::tests::filesystem
+{
+  struct storage_boot_module_fixture
+  {
+    auto setup_modules(std::size_t module_count, std::size_t module_size = 4096) -> void;
+
+  protected:
+    kapi::boot_modules::boot_module_registry registry{};
+    std::vector<std::string> module_names{};
+    std::vector<std::vector<std::byte>> module_data{};
+  };
+}  // namespace kernel::tests::filesystem
+
+#endif
+\ No newline at end of file