diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cb80273..4d79d755 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,6 +603,15 @@ if($ENV{ROS_VERSION} STREQUAL "1")
   if(CATKIN_ENABLE_TESTING)
     find_package(rostest REQUIRED)
 
+    add_rostest_gtest(feature_deep_copy_test test/feature_deep_copy.test src/tests/CI/feature_deep_copy_test.cpp)
+    set_target_properties(feature_deep_copy_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
+    target_include_directories(feature_deep_copy_test PRIVATE ${catkin_INCLUDE_DIRS})
+    target_link_libraries(feature_deep_copy_test ontologenius_lib ${catkin_LIBRARIES})
+
+    add_rostest_gtest(feature_multi_test test/feature_multi.test src/tests/CI/feature_multi_test.cpp)
+    target_include_directories(feature_multi_test PRIVATE ${catkin_INCLUDE_DIRS})
+    target_link_libraries(feature_multi_test ontologenius_lib ${catkin_LIBRARIES})
+
     add_rostest_gtest(ontologenius_library_tester test/library.test src/tests/CI/library.cpp)
     target_include_directories(ontologenius_library_tester PRIVATE ${catkin_INCLUDE_DIRS})
     target_link_libraries(ontologenius_library_tester ontologenius_lib ${catkin_LIBRARIES})
@@ -623,29 +632,20 @@ if($ENV{ROS_VERSION} STREQUAL "1")
     target_include_directories(ontologenius_propertiesInheritageIndex_tester PRIVATE ${catkin_INCLUDE_DIRS})
     target_link_libraries(ontologenius_propertiesInheritageIndex_tester ontologenius_lib ${catkin_LIBRARIES})
 
-    add_rostest_gtest(ontologenius_multi_tester test/multi.test src/tests/CI/multi.cpp)
-    target_include_directories(ontologenius_multi_tester PRIVATE ${catkin_INCLUDE_DIRS})
-    target_link_libraries(ontologenius_multi_tester ontologenius_lib ${catkin_LIBRARIES})
-
-    add_rostest_gtest(ontologenius_cpy_test test/cpy.test src/tests/CI/copy_test.cpp)
-    set_target_properties(ontologenius_cpy_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
-    target_include_directories(ontologenius_cpy_test PRIVATE ${catkin_INCLUDE_DIRS})
-    target_link_libraries(ontologenius_cpy_test ontologenius_lib ${catkin_LIBRARIES})
-
-    add_rostest_gtest(anonymous_class_test test/anonymous_class.test src/tests/CI/anonymous_class_test.cpp)
-    set_target_properties(anonymous_class_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
-    target_include_directories(anonymous_class_test PRIVATE ${catkin_INCLUDE_DIRS})
-    target_link_libraries(anonymous_class_test ontologenius_lib ${catkin_LIBRARIES})
-
-    add_rostest_gtest(chain_test test/chain.test src/tests/CI/chain_test.cpp)
-    set_target_properties(chain_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
-    target_include_directories(chain_test PRIVATE ${catkin_INCLUDE_DIRS})
-    target_link_libraries(chain_test ontologenius_lib ${catkin_LIBRARIES})
-
-    add_rostest_gtest(transitivity_test test/transitivity.test src/tests/CI/transitivity_test.cpp)
-    set_target_properties(transitivity_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
-    target_include_directories(transitivity_test PRIVATE ${catkin_INCLUDE_DIRS})
-    target_link_libraries(transitivity_test ontologenius_lib ${catkin_LIBRARIES})
+    add_rostest_gtest(reasoning_anonymous_class_test test/reasoning_anonymous_class.test src/tests/CI/reasoning_anonymous_class_test.cpp)
+    set_target_properties(reasoning_anonymous_class_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
+    target_include_directories(reasoning_anonymous_class_test PRIVATE ${catkin_INCLUDE_DIRS})
+    target_link_libraries(reasoning_anonymous_class_test ontologenius_lib ${catkin_LIBRARIES})
+
+    add_rostest_gtest(reasoning_chain_test test/reasoning_chain.test src/tests/CI/reasoning_chain_test.cpp)
+    set_target_properties(reasoning_chain_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
+    target_include_directories(reasoning_chain_test PRIVATE ${catkin_INCLUDE_DIRS})
+    target_link_libraries(reasoning_chain_test ontologenius_lib ${catkin_LIBRARIES})
+
+    add_rostest_gtest(reasoning_transitivity_test test/reasoning_transitivity.test src/tests/CI/reasoning_transitivity_test.cpp)
+    set_target_properties(reasoning_transitivity_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
+    target_include_directories(reasoning_transitivity_test PRIVATE ${catkin_INCLUDE_DIRS})
+    target_link_libraries(reasoning_transitivity_test ontologenius_lib ${catkin_LIBRARIES})
   endif()
 
 elseif($ENV{ROS_VERSION} STREQUAL "2")
@@ -653,10 +653,10 @@ elseif($ENV{ROS_VERSION} STREQUAL "2")
     find_package(ament_lint_auto REQUIRED)
     find_package(ament_cmake_gtest REQUIRED)
 
-    ament_add_gtest(ontologenius_cpy_test src/tests/CI/copy_test.cpp TIMEOUT 10)
-    set_target_properties(ontologenius_cpy_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
-    target_include_directories(ontologenius_cpy_test PRIVATE ${catkin_INCLUDE_DIRS})
-    target_link_libraries(ontologenius_cpy_test ontologenius_lib ${catkin_LIBRARIES})
+    ament_add_gtest(feature_deep_copy_test src/tests/CI/feature_deep_copy_test.cpp TIMEOUT 10)
+    set_target_properties(feature_deep_copy_test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
+    target_include_directories(feature_deep_copy_test PRIVATE ${catkin_INCLUDE_DIRS})
+    target_link_libraries(feature_deep_copy_test ontologenius_lib ${catkin_LIBRARIES})
   endif()
 endif()
 
diff --git a/src/tests/CI/copy_test.cpp b/src/tests/CI/feature_deep_copy_test.cpp
similarity index 100%
rename from src/tests/CI/copy_test.cpp
rename to src/tests/CI/feature_deep_copy_test.cpp
diff --git a/src/tests/CI/multi.cpp b/src/tests/CI/feature_multi_test.cpp
similarity index 98%
rename from src/tests/CI/multi.cpp
rename to src/tests/CI/feature_multi_test.cpp
index c669067d..15324140 100644
--- a/src/tests/CI/multi.cpp
+++ b/src/tests/CI/feature_multi_test.cpp
@@ -94,7 +94,7 @@ TEST(multi_tests, differences)
 
 int main(int argc, char** argv)
 {
-  ros::init(argc, argv, "ontologenius_multi_tester");
+  ros::init(argc, argv, "ontologenius_feature_multi_test");
 
   onto::OntologiesManipulator onto;
   onto_ptr = &onto;
diff --git a/src/tests/CI/anonymous_class_test.cpp b/src/tests/CI/reasoning_anonymous_class_test.cpp
similarity index 99%
rename from src/tests/CI/anonymous_class_test.cpp
rename to src/tests/CI/reasoning_anonymous_class_test.cpp
index c66f9675..360433ce 100644
--- a/src/tests/CI/anonymous_class_test.cpp
+++ b/src/tests/CI/reasoning_anonymous_class_test.cpp
@@ -195,7 +195,7 @@ TEST(global_tests, same_as_one_of)
 
 int main(int argc, char** argv)
 {
-  ros::init(argc, argv, "ontologenius_anonymous_inference");
+  ros::init(argc, argv, "ontologenius_reasoning_anonymous_class_test");
 
   onto::OntologyManipulator onto;
   onto_ptr = &onto;
diff --git a/src/tests/CI/chain_test.cpp b/src/tests/CI/reasoning_chain_test.cpp
similarity index 99%
rename from src/tests/CI/chain_test.cpp
rename to src/tests/CI/reasoning_chain_test.cpp
index ccefbe7a..45499c40 100644
--- a/src/tests/CI/chain_test.cpp
+++ b/src/tests/CI/reasoning_chain_test.cpp
@@ -231,7 +231,7 @@ TEST(chain_tests, chain_deletion_inheritage)
 
 int main(int argc, char** argv)
 {
-  ros::init(argc, argv, "ontologenius_chain_inference");
+  ros::init(argc, argv, "ontologenius_reasoning_chain_test");
 
   onto::OntologyManipulator onto;
   onto_ptr = &onto;
diff --git a/src/tests/CI/transitivity_test.cpp b/src/tests/CI/reasoning_transitivity_test.cpp
similarity index 99%
rename from src/tests/CI/transitivity_test.cpp
rename to src/tests/CI/reasoning_transitivity_test.cpp
index f7d1fe70..56871349 100644
--- a/src/tests/CI/transitivity_test.cpp
+++ b/src/tests/CI/reasoning_transitivity_test.cpp
@@ -215,7 +215,7 @@ TEST(chain_tests, transitivity_deletion_inheritage)
 
 int main(int argc, char** argv)
 {
-  ros::init(argc, argv, "ontologenius_transitivity_inference");
+  ros::init(argc, argv, "ontologenius_reasoning_transitivity_test");
 
   onto::OntologyManipulator onto;
   onto_ptr = &onto;
diff --git a/test/cpy.test b/test/cpy.test
deleted file mode 100644
index d28eea55..00000000
--- a/test/cpy.test
+++ /dev/null
@@ -1,4 +0,0 @@
-<launch>
-  <arg name='TESTDURATION' value='60' />
-  <test pkg="ontologenius" type="ontologenius_cpy_test" test-name="ontologenius_cpy_test" time-limit="$(arg TESTDURATION)" retry="0" />
-</launch>
diff --git a/test/feature_deep_copy.test b/test/feature_deep_copy.test
new file mode 100644
index 00000000..1d1a8548
--- /dev/null
+++ b/test/feature_deep_copy.test
@@ -0,0 +1,4 @@
+<launch>
+  <arg name='TESTDURATION' value='60' />
+  <test pkg="ontologenius" type="feature_deep_copy_test" test-name="feature_deep_copy_test" time-limit="$(arg TESTDURATION)" retry="0" />
+</launch>
diff --git a/test/multi.test b/test/feature_multi.test
similarity index 65%
rename from test/multi.test
rename to test/feature_multi.test
index ce99d29d..217f8a7d 100644
--- a/test/multi.test
+++ b/test/feature_multi.test
@@ -5,5 +5,5 @@
     <arg name="display" default="false"/>
   </include>
   <arg name='TESTDURATION' value='60' />
-  <test pkg="ontologenius" type="ontologenius_multi_tester" test-name="ontologenius_multi_tester" time-limit="$(arg TESTDURATION)" retry="0" />
+  <test pkg="ontologenius" type="feature_multi_test" test-name="feature_multi_test" time-limit="$(arg TESTDURATION)" retry="0" />
 </launch>
diff --git a/test/anonymous_class.test b/test/reasoning_anonymous_class.test
similarity index 67%
rename from test/anonymous_class.test
rename to test/reasoning_anonymous_class.test
index 7df4fcb2..e22a6d9c 100644
--- a/test/anonymous_class.test
+++ b/test/reasoning_anonymous_class.test
@@ -5,5 +5,5 @@
     <arg name="files" default="$(find ontologenius)/files/CI/test_anonymous_classes.owl"/>
   </include>
   <arg name='TESTDURATION' value='60' />
-  <test pkg="ontologenius" type="anonymous_class_test" test-name="anonymous_class_test" time-limit="$(arg TESTDURATION)" retry="0" />
+  <test pkg="ontologenius" type="reasoning_anonymous_class_test" test-name="reasoning_anonymous_class_test" time-limit="$(arg TESTDURATION)" retry="0" />
 </launch>
diff --git a/test/chain.test b/test/reasoning_chain.test
similarity index 69%
rename from test/chain.test
rename to test/reasoning_chain.test
index 41518f50..338faa5d 100644
--- a/test/chain.test
+++ b/test/reasoning_chain.test
@@ -5,5 +5,5 @@
     <arg name="files" default="$(find ontologenius)/files/CI/test_chain.owl"/>
   </include>
   <arg name='TESTDURATION' value='60' />
-  <test pkg="ontologenius" type="chain_test" test-name="chain_test" time-limit="$(arg TESTDURATION)" retry="0" />
+  <test pkg="ontologenius" type="reasoning_chain_test" test-name="reasoning_chain_test" time-limit="$(arg TESTDURATION)" retry="0" />
 </launch>
diff --git a/test/transitivity.test b/test/reasoning_transitivity.test
similarity index 67%
rename from test/transitivity.test
rename to test/reasoning_transitivity.test
index 1688c8fd..3c02eca8 100644
--- a/test/transitivity.test
+++ b/test/reasoning_transitivity.test
@@ -5,5 +5,5 @@
     <arg name="files" default="$(find ontologenius)/files/CI/test_transitivity.owl"/>
   </include>
   <arg name='TESTDURATION' value='60' />
-  <test pkg="ontologenius" type="transitivity_test" test-name="chain_test" time-limit="$(arg TESTDURATION)" retry="0" />
+  <test pkg="ontologenius" type="reasoning_transitivity_test" test-name="reasoning_transitivity_test" time-limit="$(arg TESTDURATION)" retry="0" />
 </launch>