diff --git a/ros2model/api/model_generator/message_generator.py b/ros2model/api/model_generator/message_generator.py
index 9163fb5..7b704ab 100644
--- a/ros2model/api/model_generator/message_generator.py
+++ b/ros2model/api/model_generator/message_generator.py
@@ -25,7 +25,7 @@
     from ament_index_python import get_package_share_directory
 
     Template_Folder_ROS = Path(get_package_share_directory("ros2model") + "/templates")
-    Template_ROS = Path(Template_Folder_ROS / "message.ros2.j2")
+    Template_ROS = Path(Template_Folder_ROS / "message.ros.j2")
 except ImportError:
     Template_ROS = None
 
@@ -35,7 +35,7 @@ def __init__(self, template_path=None) -> None:
         if template_path != None:
             self.template_path = Path(template_path).resolve()
         elif Template_ROS != None and Template_ROS.is_file():
-            self.template_path = Template
+            self.template_path = Template_ROS
         elif Template.is_file():
             self.template_path = Template
         else:
diff --git a/test/unittest/test_generate_component.py b/test/unittest/test_generate_component.py
index a21d89a..0aebf69 100644
--- a/test/unittest/test_generate_component.py
+++ b/test/unittest/test_generate_component.py
@@ -43,12 +43,8 @@
     ],
 )
 
-from devtools import pprint
-
-# pprint(test_model)
-
 test_dir = "test"
-output_folder = "outputs"
+output_folder = Path(__file__).parent.parent / "output"
 
 expect_result = """
 test_model:
diff --git a/test/unittest/test_generate_interface.py b/test/unittest/test_generate_interface.py
index c331c55..47a3154 100644
--- a/test/unittest/test_generate_interface.py
+++ b/test/unittest/test_generate_interface.py
@@ -46,7 +46,7 @@
 )
 
 test_dir = "test"
-output_folder = "outputs"
+output_folder = Path(__file__).parent.parent / "output"
 
 expect_result = """
 test_interfaces: