diff --git a/example_python/generate_parameter_module_example/__init__.py b/example_python/generate_parameter_module_example/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/example_python/test/test_load_modules.py b/example_python/test/test_load_modules.py
new file mode 100644
index 00000000..0d0bdf4a
--- /dev/null
+++ b/example_python/test/test_load_modules.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+import generate_parameter_module_example
+
+print(f'Imported module from: {generate_parameter_module_example.__file__}')
+
+import generate_parameter_module_example.admittance_parameters  # noqa: E402
+
+print('Imported generated parameter module')
+
+import generate_parameter_module_example.minimal_publisher  # noqa: E402
+
+print('Imported minimal publisher module')
diff --git a/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py b/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py
index 8ba867f1..e0c899d6 100755
--- a/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py
+++ b/generate_parameter_library_py/generate_parameter_library_py/generate_python_module.py
@@ -48,6 +48,10 @@ def run(output_file, yaml_file, validation_module=''):
     with open(output_file, 'w') as f:
         f.write(code)
 
+    # Put an __init__.py file if one does not yet exist.
+    init_file = os.path.join(os.path.dirname(output_file), '__init__.py')
+    open(init_file, 'a').close()
+
 
 def parse_args():
     parser = argparse.ArgumentParser()
diff --git a/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py b/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
index 4149223e..ed4de8e3 100644
--- a/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
+++ b/generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
@@ -55,6 +55,7 @@ def generate_parameter_module(module_name, yaml_file, validation_module=''):
             install_dir = os.path.join(
                 colcon_ws,
                 'install',
+                pkg_name,
                 'lib',
                 py_version,
                 'site-packages',