diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0586a578..e4dde69e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,8 +26,8 @@ jobs:
     strategy:
       matrix:
         include:
-#          - { ROS_DISTRO: kinetic }
-#          - { ROS_DISTRO: melodic }
+          - { ROS_DISTRO: kinetic }
+          - { ROS_DISTRO: melodic }
           - { ROS_DISTRO: noetic }
 
     steps:
diff --git a/atf_core/src/atf_core/configuration_parser.py b/atf_core/src/atf_core/configuration_parser.py
index 6d83bb98..9b5ccc15 100644
--- a/atf_core/src/atf_core/configuration_parser.py
+++ b/atf_core/src/atf_core/configuration_parser.py
@@ -323,11 +323,9 @@ def get_sorted_plot_dicts(self, atf_result, filter_tests, filter_testblocks, fil
                     # mtb
                     if metric_name            not in list(mtb.keys()):
                         mtb[metric_name] = {}
-                    #test_name = test.name
-                    test_name = test.name + "\n" + test.robot
-                    if test_name              not in list(mtb[metric_name].keys()):
-                        mtb[metric_name][test_name] = {}
-                    mtb[metric_name][test_name][testblock.name] = metric
+                    if test.name              not in list(mtb[metric_name].keys()):
+                        mtb[metric_name][test.name] = {}
+                    mtb[metric_name][test.name][testblock.name] = metric
 
         ret = {}
         ret['tbm'] = tbm
diff --git a/atf_test/atf/test_generation_config.yaml b/atf_test/atf/test_generation_config.yaml
index 6f80d628..3d86154f 100644
--- a/atf_test/atf/test_generation_config.yaml
+++ b/atf_test/atf/test_generation_config.yaml
@@ -31,7 +31,7 @@ testsuites:                # You have to define at least one testsuite
     testblocksets:         # You have to define at least one testblockset
       - testblockset1
       - testblockset2
-    repetitions: 1        # Number of repetitions per test (this is an optional parameter, default = 1)
+#    repetitions: 1        # Number of repetitions per test (this is an optional parameter, default = 1)
 
   - tests:
       - test1