diff --git a/doc/benchmark/FAIR4RS/FAIR4RS.jsonld b/doc/benchmark/FAIR4RS/FAIR4RS.jsonld
index 639ebdd..d442b11 100644
--- a/doc/benchmark/FAIR4RS/FAIR4RS.jsonld
+++ b/doc/benchmark/FAIR4RS/FAIR4RS.jsonld
@@ -1,93 +1,93 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
+        "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier"
+                "@value": "https://w3id.org/everse/i/indicators/descriptive_metadata"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "unique identifier"
+                "@value": "descriptive metadata"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software has persistent and unique identifier"
+                "@value": "Software has descriptive metadata"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use",
+        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/versioning_standards_use"
+                "@value": "https://w3id.org/everse/i/indicators/version_control_use"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "versioning standard"
+                "@value": "version control"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software follows versioning standards"
+                "@value": "Software makes use of version control"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
+        "@id": "https://w3id.org/everse/i/indicators/archived_in_scholarly_repository",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/descriptive_metadata"
+                "@value": "https://w3id.org/everse/i/indicators/archived_in_scholarly_repository"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "descriptive metadata"
+                "@value": "scholarly repository"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software has descriptive metadata"
+                "@value": "Software is archived in a scholarly repository"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@id": "https://w3id.org/everse/i/indicators/listed_in_registry",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/software_documentation"
+                "@value": "https://w3id.org/everse/i/indicators/listed_in_registry"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "documentation"
+                "@value": "listed in registry"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software has documentation"
+                "@value": "Software is listed in a registry"
             }
         ]
     },
@@ -115,273 +115,151 @@
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
+        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/requirements_specified"
+                "@value": "https://w3id.org/everse/i/indicators/software_has_license"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "requirements"
+                "@value": "has license"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software specifies requirements"
+                "@value": "Software has license"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/benchmark/FAIR4RS",
+        "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
         "@type": [
-            "https://w3id.org/ftr#Benchmark"
-        ],
-        "http://purl.org/dc/terms/creator": [
-            {
-                "@id": "https://orcid.org/0000-0003-0454-7145"
-            },
-            {
-                "@id": "https://github.com/andriumon"
-            }
-        ],
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Benchmark that implements FAIR4RS, based on the metrics from the FAIR-IMPACT deliverable D5.2 (Metrics for automated FAIR software assessment in a disciplinary context)"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/rsfc/benchmark/FAIR4RS"
-            }
-        ],
-        "http://purl.org/dc/terms/license": [
-            {
-                "@id": "http://creativecommons.org/licenses/by/4.0/"
-            }
-        ],
-        "http://purl.org/dc/terms/title": [
-            {
-                "@language": "en",
-                "@value": "General Benchmark for RSFC"
+                "@value": "https://w3id.org/everse/i/indicators/software_has_citation"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "FAIR4RS Benchmark "
+                "@value": "uses citation"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "FAIR4RS Benchmark "
-            }
-        ],
-        "http://www.w3.org/ns/dcat#contactPoint": [
-            {
-                "@id": "https://orcid.org/0000-0003-0454-7145"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#keyword": [
-            {
-                "@language": "en",
-                "@value": "General Benchmark"
-            },
-            {
-                "@language": "en",
-                "@value": "Benchmark"
-            },
-            {
-                "@language": "en",
-                "@value": "Default"
-            },
-            {
-                "@language": "en",
-                "@value": "RSFC"
-            },
-            {
-                "@language": "en",
-                "@value": "Quality checks"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#landingPage": [
-            {
-                "@id": "https://w3id.org/rsfc/benchmark/FAIR4RS"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#version": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "0.0.1"
-            }
-        ],
-        "https://w3id.org/ftr#hasAssociatedMetric": [
-            {
-                "@id": "https://w3id.org/everse/i/indicators/archived_in_scholarly_repository"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/archived_in_software_heritage"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/codemeta_completeness"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/software_has_citation"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/software_has_license"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/has_no_linting_issues"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/listed_in_registry"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/requirements_specified"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/software_documentation"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/software_has_tests"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/uses_tool_for_warnings_or_mistakes"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/version_control_use"
-            },
-            {
-                "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use"
-            }
-        ],
-        "https://w3id.org/ftr#status": [
-            {
-                "@language": "en",
-                "@value": "Active"
+                "@value": "Software uses citation"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
+        "@id": "https://github.com/andriumon",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://w3id.org/everse/i/indicators/software_has_license"
-            }
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "has license"
+                "@value": "Andres Montero"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software has license"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/codemeta_completeness",
+        "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/codemeta_completeness"
+                "@value": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "completeness"
+                "@value": "unique identifier"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "CodeMeta completeness"
+                "@value": "Software has persistent and unique identifier"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
+        "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/version_control_use"
+                "@value": "https://w3id.org/everse/i/indicators/versioning_standards_use"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "version control"
+                "@value": "versioning standard"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software makes use of version control"
+                "@value": "Software follows versioning standards"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/listed_in_registry",
+        "@id": "https://w3id.org/everse/i/indicators/codemeta_completeness",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/listed_in_registry"
+                "@value": "https://w3id.org/everse/i/indicators/codemeta_completeness"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "listed in registry"
+                "@value": "completeness"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software is listed in a registry"
+                "@value": "CodeMeta completeness"
             }
         ]
     },
@@ -432,65 +310,187 @@
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/archived_in_scholarly_repository",
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
         "@type": [
             "http://www.w3.org/ns/dqv#Metric"
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/archived_in_scholarly_repository"
+                "@value": "https://w3id.org/everse/i/indicators/software_documentation"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "scholarly repository"
+                "@value": "documentation"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software is archived in a scholarly repository"
+                "@value": "Software has documentation"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
+        "@id": "https://w3id.org/rsfc/benchmark/FAIR4RS",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "https://w3id.org/ftr#Benchmark"
+        ],
+        "http://purl.org/dc/terms/creator": [
+            {
+                "@id": "https://orcid.org/0000-0003-0454-7145"
+            },
+            {
+                "@id": "https://github.com/andriumon"
+            }
+        ],
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Benchmark that implements FAIR4RS, based on the metrics from the FAIR-IMPACT deliverable D5.2 (Metrics for automated FAIR software assessment in a disciplinary context)"
+            }
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/everse/i/indicators/software_has_citation"
+                "@value": "https://w3id.org/rsfc/benchmark/FAIR4RS"
+            }
+        ],
+        "http://purl.org/dc/terms/license": [
+            {
+                "@id": "http://creativecommons.org/licenses/by/4.0/"
+            }
+        ],
+        "http://purl.org/dc/terms/title": [
+            {
+                "@language": "en",
+                "@value": "General Benchmark for RSFC"
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "uses citation"
+                "@value": "FAIR4RS Benchmark "
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Software uses citation"
+                "@value": "FAIR4RS Benchmark "
+            }
+        ],
+        "http://www.w3.org/ns/dcat#contactPoint": [
+            {
+                "@id": "https://orcid.org/0000-0003-0454-7145"
+            }
+        ],
+        "http://www.w3.org/ns/dcat#keyword": [
+            {
+                "@language": "en",
+                "@value": "General Benchmark"
+            },
+            {
+                "@language": "en",
+                "@value": "Benchmark"
+            },
+            {
+                "@language": "en",
+                "@value": "Default"
+            },
+            {
+                "@language": "en",
+                "@value": "RSFC"
+            },
+            {
+                "@language": "en",
+                "@value": "Quality checks"
+            }
+        ],
+        "http://www.w3.org/ns/dcat#landingPage": [
+            {
+                "@id": "https://w3id.org/rsfc/benchmark/FAIR4RS"
+            }
+        ],
+        "http://www.w3.org/ns/dcat#version": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "0.0.1"
+            }
+        ],
+        "https://w3id.org/ftr#hasAssociatedMetric": [
+            {
+                "@id": "https://w3id.org/everse/i/indicators/archived_in_scholarly_repository"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/archived_in_software_heritage"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/codemeta_completeness"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/software_has_citation"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/software_has_license"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/has_no_linting_issues"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/listed_in_registry"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/requirements_specified"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/software_documentation"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/software_has_tests"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/uses_tool_for_warnings_or_mistakes"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/version_control_use"
+            },
+            {
+                "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use"
+            }
+        ],
+        "https://w3id.org/ftr#status": [
+            {
+                "@language": "en",
+                "@value": "Active"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://w3id.org/everse/i/indicators/requirements_specified"
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "requirements"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Software specifies requirements"
             }
         ]
     }
diff --git a/doc/catalog.html b/doc/catalog.html
index dd17859..73adbe0 100644
--- a/doc/catalog.html
+++ b/doc/catalog.html
@@ -428,16 +428,6 @@
                             <td>0.0.1</td> -->
                             <td class="keywords">Author, Rol, Test</td>
                         </tr>
-                        <tr>
-                            <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-06-4">https://w3id.org/rsfc/test/RSFC-06-4</a></td> -->
-                            <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-06-4"><strong>RSFC-06-4</strong></a></td>
-                            <td class="titles">Authors have roles</td>
-                            <td>Findable, Reusable</td>
-                            <td><span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.a712f1', '_blank')" style="cursor:pointer;">F2</span> <span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.60a40f', '_blank')" style="cursor:pointer;">R3</span></td>
-                            <!-- <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank"><span class="label label-success">CC-BY-4.0</span></a></td>
-                            <td>0.0.1</td> -->
-                            <td class="keywords">Author, Rol, Test</td>
-                        </tr>
                         <tr>
                             <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-07-1">https://w3id.org/rsfc/test/RSFC-07-1</a></td> -->
                             <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-07-1"><strong>RSFC-07-1</strong></a></td>
@@ -462,7 +452,7 @@
                             <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-08-1">https://w3id.org/rsfc/test/RSFC-08-1</a></td> -->
                             <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-08-1"><strong>RSFC-08-1</strong></a></td>
                             <td class="titles">Metadata record in Software Heritage or Zenodo</td>
-                            <td>Findable, Accessible, Reusable</td>
+                            <td>Accessible, Findable, Reusable</td>
                             <td><span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.aeef8a', '_blank')" style="cursor:pointer;">F4</span> <span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.8367a5', '_blank')" style="cursor:pointer;">A2</span> <span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.60a40f', '_blank')" style="cursor:pointer;">R3</span></td>
                             <!-- <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank"><span class="label label-success">CC-BY-4.0</span></a></td>
                             <td>0.0.1</td> -->
@@ -578,16 +568,6 @@
                             <td>0.0.1</td> -->
                             <td class="keywords">Metadata, Codemeta, Citation, Repository, Test</td>
                         </tr>
-                        <tr>
-                            <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-17-1">https://w3id.org/rsfc/test/RSFC-17-1</a></td> -->
-                            <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-17-1"><strong>RSFC-17-1</strong></a></td>
-                            <td class="titles">Repository active</td>
-                            <td>Reusable</td>
-                            <td><span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.9ca8a1', '_blank')" style="cursor:pointer;">R1.2</span></td>
-                            <!-- <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank"><span class="label label-success">CC-BY-4.0</span></a></td>
-                            <td>0.0.1</td> -->
-                            <td class="keywords">Active, Repository, Test</td>
-                        </tr>
                         <tr>
                             <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-17-2">https://w3id.org/rsfc/test/RSFC-17-2</a></td> -->
                             <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-17-2"><strong>RSFC-17-2</strong></a></td>
@@ -632,12 +612,22 @@
                             <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-20-1">https://w3id.org/rsfc/test/RSFC-20-1</a></td> -->
                             <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-20-1"><strong>RSFC-20-1</strong></a></td>
                             <td class="titles">Repository has an issue tracker</td>
-                            <td></td>
-                            <td><span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.60a40f', '_blank')" style="cursor:pointer;"></span></td>
+                            <td>Reusable</td>
+                            <td><span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.60a40f', '_blank')" style="cursor:pointer;">R3</span></td>
                             <!-- <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank"><span class="label label-success">CC-BY-4.0</span></a></td>
                             <td>0.0.1</td> -->
                             <td class="keywords">Issue tracker, Repository, Test</td>
                         </tr>
+                        <tr>
+                            <!-- <td><a href="https://w3id.org/rsfc/test/RSFC-22-1">https://w3id.org/rsfc/test/RSFC-22-1</a></td> -->
+                            <td class="short-name"> <a href="https://w3id.org/rsfc/test/RSFC-22-1"><strong>RSFC-22-1</strong></a></td>
+                            <td class="titles">Software is containerized</td>
+                            <td>Reusable</td>
+                            <td><span class="label label-success" onclick="window.open('https://doi.org/10.25504/FAIRsharing.60a40f', '_blank')" style="cursor:pointer;">R3</span></td>
+                            <!-- <td><a href="http://creativecommons.org/licenses/by/4.0/" target="_blank"><span class="label label-success">CC-BY-4.0</span></a></td>
+                            <td>0.0.1</td> -->
+                            <td class="keywords">Containerized, Repository, Test</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/doc/index.html b/doc/index.html
index c47558c..5d2f5a8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -45,7 +45,7 @@ <h1>RSFC Catalogue</h1>
           </div>
           <div class="panel-body text-center">
             <p>Explore all available RSFC tests.</p>
-            <p style="font-size: 22px;">41 Tests</p>
+            <p style="font-size: 22px;">40 Tests</p>
             <a href="https://oeg-upm.github.io/rsfc/doc/catalog.html#test" class="btn btn-default">Go to Tests</a>
           </div>
         </div>
diff --git a/doc/test/RSFC-01-1/RSFC-01-1.jsonld b/doc/test/RSFC-01-1/RSFC-01-1.jsonld
index a462583..f62781f 100644
--- a/doc/test/RSFC-01-1/RSFC-01-1.jsonld
+++ b/doc/test/RSFC-01-1/RSFC-01-1.jsonld
@@ -1,67 +1,4 @@
 [
-    {
-        "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.87c9a8"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
     {
         "@id": "https://oeg.fi.upm.es",
         "@type": [
@@ -194,6 +131,72 @@
             }
         ]
     },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.87c9a8"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://ror.org/03n6nwv02",
         "@type": [
@@ -215,6 +218,20 @@
             }
         ]
     },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
         "http://purl.org/dc/terms/description": [
@@ -235,22 +252,5 @@
                 "@value": "F1"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-01-2/RSFC-01-2.html b/doc/test/RSFC-01-2/RSFC-01-2.html
index c29d780..1cae1f7 100644
--- a/doc/test/RSFC-01-2/RSFC-01-2.html
+++ b/doc/test/RSFC-01-2/RSFC-01-2.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-01-2/RSFC-01-2.jsonld b/doc/test/RSFC-01-2/RSFC-01-2.jsonld
index d628de3..b54dbff 100644
--- a/doc/test/RSFC-01-2/RSFC-01-2.jsonld
+++ b/doc/test/RSFC-01-2/RSFC-01-2.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
         "@type": [
@@ -10,6 +26,96 @@
             }
         ]
     },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-01-2",
         "@type": [
@@ -126,95 +232,6 @@
             }
         ]
     },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
         "http://purl.org/dc/terms/description": [
@@ -235,22 +252,5 @@
                 "@value": "F1"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-01-3/RSFC-01-3.html b/doc/test/RSFC-01-3/RSFC-01-3.html
index dc1b94d..36d1255 100644
--- a/doc/test/RSFC-01-3/RSFC-01-3.html
+++ b/doc/test/RSFC-01-3/RSFC-01-3.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-01-3/RSFC-01-3.jsonld b/doc/test/RSFC-01-3/RSFC-01-3.jsonld
index 3886119..a6b82b5 100644
--- a/doc/test/RSFC-01-3/RSFC-01-3.jsonld
+++ b/doc/test/RSFC-01-3/RSFC-01-3.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
         "@type": [
@@ -10,6 +26,96 @@
             }
         ]
     },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-01-3",
         "@type": [
@@ -126,95 +232,6 @@
             }
         ]
     },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
         "http://purl.org/dc/terms/description": [
@@ -235,22 +252,5 @@
                 "@value": "F1"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-03-1/RSFC-03-1.html b/doc/test/RSFC-03-1/RSFC-03-1.html
index 0a4dc9d..8dbd1d1 100644
--- a/doc/test/RSFC-03-1/RSFC-03-1.html
+++ b/doc/test/RSFC-03-1/RSFC-03-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-03-1/RSFC-03-1.jsonld b/doc/test/RSFC-03-1/RSFC-03-1.jsonld
index 26f46bf..5ffeced 100644
--- a/doc/test/RSFC-03-1/RSFC-03-1.jsonld
+++ b/doc/test/RSFC-03-1/RSFC-03-1.jsonld
@@ -1,15 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -130,23 +132,13 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Different versions of the software are assigned distinct identifiers."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
+        "@id": "https://w3id.org/everse/i/indicators/has_releases",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
+                "@id": "https://doi.org/10.25504/FAIRsharing.ef9fc3"
             }
         ]
     },
@@ -168,29 +160,19 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/has_releases",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.ef9fc3"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -216,40 +198,58 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is assigned a globally unique and persistent identifier."
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Different versions of the software are assigned distinct identifiers."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is assigned a globally unique and persistent identifier."
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F1"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1"
             }
         ]
     }
diff --git a/doc/test/RSFC-03-2/RSFC-03-2.html b/doc/test/RSFC-03-2/RSFC-03-2.html
index 718c461..d409e64 100644
--- a/doc/test/RSFC-03-2/RSFC-03-2.html
+++ b/doc/test/RSFC-03-2/RSFC-03-2.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-03-2/RSFC-03-2.jsonld b/doc/test/RSFC-03-2/RSFC-03-2.jsonld
index 3cc4268..db730f6 100644
--- a/doc/test/RSFC-03-2/RSFC-03-2.jsonld
+++ b/doc/test/RSFC-03-2/RSFC-03-2.jsonld
@@ -1,69 +1,118 @@
 [
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://w3id.org/everse/i/indicators/has_releases",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@language": "en",
-                "@value": "Different versions of the software are assigned distinct identifiers."
+                "@id": "https://doi.org/10.25504/FAIRsharing.ef9fc3"
             }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
+                "@value": "Andres Montero"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Organization"
         ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Different versions of the software are assigned distinct identifiers."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1.2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1.2"
             }
         ]
     },
@@ -187,38 +236,6 @@
             }
         ]
     },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/has_releases",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.ef9fc3"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
         "http://purl.org/dc/terms/description": [
@@ -239,22 +256,5 @@
                 "@value": "F1"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-03-3/RSFC-03-3.html b/doc/test/RSFC-03-3/RSFC-03-3.html
index 8c131f3..025b0dc 100644
--- a/doc/test/RSFC-03-3/RSFC-03-3.html
+++ b/doc/test/RSFC-03-3/RSFC-03-3.html
@@ -42,7 +42,7 @@ <h1 class="miClase text-center">RSFC-03-3</h1>
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if all version identifiers follow either SemVer or CalVer conventions. This is achieved by checking if there’s any releases created in the repository and that their version numbers (or tags) follow Semantic Versioning (SemVer) or Calendar Versioning (CalVer).</p></div>
+                <div class="col-md-12 well" style="font-size: 18px;"> <p>TThis test checks if a 80% of all version identifiers follow either SemVer or CalVer conventions. This is achieved by checking if there’s any releases created in the repository and that their version numbers (or tags) follow Semantic Versioning (SemVer) or Calendar Versioning (CalVer).</p></div>
             </div>
             <div class="row flex-space-between"> 
                 <div class="col-md-12 align-items-center"> 
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-03-3/RSFC-03-3.jsonld b/doc/test/RSFC-03-3/RSFC-03-3.jsonld
index c30a0f3..b45b2cf 100644
--- a/doc/test/RSFC-03-3/RSFC-03-3.jsonld
+++ b/doc/test/RSFC-03-3/RSFC-03-3.jsonld
@@ -1,67 +1,4 @@
 [
-    {
-        "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.c34a82"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Different versions of the software are assigned distinct identifiers."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
     {
         "@id": "https://oeg.fi.upm.es",
         "@type": [
@@ -95,7 +32,7 @@
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "This test checks if all version identifiers follow either SemVer or CalVer conventions. This is achieved by checking if there’s any releases created in the repository and that their version numbers (or tags) follow Semantic Versioning (SemVer) or Calendar Versioning (CalVer)."
+                "@value": "TThis test checks if a 80% of all version identifiers follow either SemVer or CalVer conventions. This is achieved by checking if there’s any releases created in the repository and that their version numbers (or tags) follow Semantic Versioning (SemVer) or Calendar Versioning (CalVer)."
             }
         ],
         "http://purl.org/dc/terms/identifier": [
@@ -194,6 +131,51 @@
             }
         ]
     },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.c34a82"
+            }
+        ]
+    },
     {
         "@id": "https://ror.org/03n6nwv02",
         "@type": [
@@ -216,40 +198,58 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is assigned a globally unique and persistent identifier."
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Different versions of the software are assigned distinct identifiers."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is assigned a globally unique and persistent identifier."
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F1"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1"
             }
         ]
     }
diff --git a/doc/test/RSFC-03-3/RSFC-03-3.ttl b/doc/test/RSFC-03-3/RSFC-03-3.ttl
index a58a7ec..7dcb2b5 100644
--- a/doc/test/RSFC-03-3/RSFC-03-3.ttl
+++ b/doc/test/RSFC-03-3/RSFC-03-3.ttl
@@ -20,7 +20,7 @@
     rdfs:label "RSFC-03-3"^^xsd:string ;
     vivo:abbreviation "RSFC-03-3"^^xsd:string ;
     dcterms:license <http://creativecommons.org/licenses/by/4.0/> ;
-    dcterms:description """This test checks if all version identifiers follow either SemVer or CalVer conventions. This is achieved by checking if there’s any releases created in the repository and that their version numbers (or tags) follow Semantic Versioning (SemVer) or Calendar Versioning (CalVer)."""@en ;
+    dcterms:description """TThis test checks if a 80% of all version identifiers follow either SemVer or CalVer conventions. This is achieved by checking if there’s any releases created in the repository and that their version numbers (or tags) follow Semantic Versioning (SemVer) or Calendar Versioning (CalVer)."""@en ;
     dcterms:publisher <https://oeg.fi.upm.es> ,
                       <https://ror.org/03n6nwv02> ;
     dqv:inDimension  <https://doi.org/10.25504/FAIRsharing.99299d>, <https://doi.org/10.25504/FAIRsharing.656e6c>;
diff --git a/doc/test/RSFC-03-4/RSFC-03-4.html b/doc/test/RSFC-03-4/RSFC-03-4.html
index 6b14ba7..29052bf 100644
--- a/doc/test/RSFC-03-4/RSFC-03-4.html
+++ b/doc/test/RSFC-03-4/RSFC-03-4.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-03-4/RSFC-03-4.jsonld b/doc/test/RSFC-03-4/RSFC-03-4.jsonld
index 15d071e..8877749 100644
--- a/doc/test/RSFC-03-4/RSFC-03-4.jsonld
+++ b/doc/test/RSFC-03-4/RSFC-03-4.jsonld
@@ -1,12 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.c34a82"
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -131,70 +136,47 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Different versions of the software are assigned distinct identifiers."
-            }
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
+                "@value": "Andres Montero"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://w3id.org/everse/i/indicators/versioning_standards_use",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://doi.org/10.25504/FAIRsharing.c34a82"
             }
         ]
     },
@@ -220,40 +202,58 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is assigned a globally unique and persistent identifier."
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Different versions of the software are assigned distinct identifiers."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is assigned a globally unique and persistent identifier."
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F1"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1"
             }
         ]
     }
diff --git a/doc/test/RSFC-03-5/RSFC-03-5.html b/doc/test/RSFC-03-5/RSFC-03-5.html
index a161485..0de9621 100644
--- a/doc/test/RSFC-03-5/RSFC-03-5.html
+++ b/doc/test/RSFC-03-5/RSFC-03-5.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-03-5/RSFC-03-5.jsonld b/doc/test/RSFC-03-5/RSFC-03-5.jsonld
index c4fbb9f..be3270d 100644
--- a/doc/test/RSFC-03-5/RSFC-03-5.jsonld
+++ b/doc/test/RSFC-03-5/RSFC-03-5.jsonld
@@ -1,4 +1,121 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/has_releases",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.ef9fc3"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Different versions of the software are assigned distinct identifiers."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1.2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1.2"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-03-5",
         "@type": [
@@ -119,106 +236,6 @@
             }
         ]
     },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Different versions of the software are assigned distinct identifiers."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/has_releases",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.ef9fc3"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
         "http://purl.org/dc/terms/description": [
@@ -239,22 +256,5 @@
                 "@value": "F1"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-03-6/RSFC-03-6.jsonld b/doc/test/RSFC-03-6/RSFC-03-6.jsonld
index 8c93813..b1d9555 100644
--- a/doc/test/RSFC-03-6/RSFC-03-6.jsonld
+++ b/doc/test/RSFC-03-6/RSFC-03-6.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
         "@type": [
@@ -130,41 +146,6 @@
             }
         ]
     },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Different versions of the software are assigned distinct identifiers."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1.2"
-            }
-        ]
-    },
     {
         "@id": "https://github.com/andriumon",
         "@type": [
@@ -183,18 +164,19 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -220,40 +202,58 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is assigned a globally unique and persistent identifier."
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.656e6c",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Different versions of the software are assigned distinct identifiers."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F1"
+                "@value": "F1.2"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://doi.org/10.25504/FAIRsharing.99299d",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is assigned a globally unique and persistent identifier."
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F1"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F1"
             }
         ]
     }
diff --git a/doc/test/RSFC-04-1/RSFC-04-1.jsonld b/doc/test/RSFC-04-1/RSFC-04-1.jsonld
index 0bba929..6f3efce 100644
--- a/doc/test/RSFC-04-1/RSFC-04-1.jsonld
+++ b/doc/test/RSFC-04-1/RSFC-04-1.jsonld
@@ -1,4 +1,107 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.ea8b47"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with a plurality of accurate and relevant attributes."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-04-1",
         "@type": [
@@ -119,55 +222,23 @@
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.ea8b47"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with a plurality of accurate and relevant attributes."
-            }
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://purl.org/dc/terms/identifier": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
+                "@value": "https://ror.org/02h3v0f81"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@id": "https://www.upm.es/"
             }
         ]
     },
@@ -205,76 +276,5 @@
                 "@value": "F2"
             }
         ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-04-2/RSFC-04-2.html b/doc/test/RSFC-04-2/RSFC-04-2.html
index 45ffdb5..5ed7f95 100644
--- a/doc/test/RSFC-04-2/RSFC-04-2.html
+++ b/doc/test/RSFC-04-2/RSFC-04-2.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-04-2/RSFC-04-2.jsonld b/doc/test/RSFC-04-2/RSFC-04-2.jsonld
index 0e1e30f..e77e072 100644
--- a/doc/test/RSFC-04-2/RSFC-04-2.jsonld
+++ b/doc/test/RSFC-04-2/RSFC-04-2.jsonld
@@ -1,12 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -172,37 +177,19 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with rich metadata."
-            }
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -224,56 +211,69 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Organization"
         ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
         ],
-        "http://purl.org/dc/terms/identifier": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@value": "https://ror.org/02h3v0f81"
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with rich metadata."
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@value": "Universidad Politécnica de Madrid"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://www.upm.es/"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     }
diff --git a/doc/test/RSFC-04-3/RSFC-04-3.jsonld b/doc/test/RSFC-04-3/RSFC-04-3.jsonld
index 9605758..29c333f 100644
--- a/doc/test/RSFC-04-3/RSFC-04-3.jsonld
+++ b/doc/test/RSFC-04-3/RSFC-04-3.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
         "@type": [
@@ -32,91 +48,92 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Andres Montero"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is described with rich metadata."
+                "@value": "Software meets domain-relevant community standards."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Organization"
         ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
@@ -244,40 +261,23 @@
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "http://purl.org/dc/terms/description": [
             {
-                "@id": "https://www.upm.es/"
+                "@language": "en",
+                "@value": "Software is described with rich metadata."
             }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ]
     }
diff --git a/doc/test/RSFC-04-4/RSFC-04-4.jsonld b/doc/test/RSFC-04-4/RSFC-04-4.jsonld
index 0e15633..ed383b7 100644
--- a/doc/test/RSFC-04-4/RSFC-04-4.jsonld
+++ b/doc/test/RSFC-04-4/RSFC-04-4.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/everse/i/indicators/descriptive_metadata",
         "@type": [
@@ -32,112 +48,113 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@value": "Andres Montero"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is described with rich metadata."
+                "@value": "Software meets domain-relevant community standards."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://purl.org/dc/terms/identifier": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "https://ror.org/02h3v0f81"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@value": "Ontology Engineering Group"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
+        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "http://purl.org/dc/terms/description": [
             {
-                "@value": "https://ror.org/02h3v0f81"
+                "@language": "en",
+                "@value": "Software is described with rich metadata."
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@value": "Universidad Politécnica de Madrid"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://www.upm.es/"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ]
     },
@@ -263,22 +280,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-04-5/RSFC-04-5.html b/doc/test/RSFC-04-5/RSFC-04-5.html
index 67cb913..a2ace59 100644
--- a/doc/test/RSFC-04-5/RSFC-04-5.html
+++ b/doc/test/RSFC-04-5/RSFC-04-5.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-04-5/RSFC-04-5.jsonld b/doc/test/RSFC-04-5/RSFC-04-5.jsonld
index 816627b..f428346 100644
--- a/doc/test/RSFC-04-5/RSFC-04-5.jsonld
+++ b/doc/test/RSFC-04-5/RSFC-04-5.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-04-5",
         "@type": [
@@ -151,91 +167,57 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Andres Montero"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is described with rich metadata."
+                "@value": "Software meets domain-relevant community standards."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -261,19 +243,37 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with rich metadata."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ]
     }
diff --git a/doc/test/RSFC-05-1/RSFC-05-1.html b/doc/test/RSFC-05-1/RSFC-05-1.html
index 3390e87..d4d557d 100644
--- a/doc/test/RSFC-05-1/RSFC-05-1.html
+++ b/doc/test/RSFC-05-1/RSFC-05-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-05-1/RSFC-05-1.jsonld b/doc/test/RSFC-05-1/RSFC-05-1.jsonld
index 86cdcde..dc4edd4 100644
--- a/doc/test/RSFC-05-1/RSFC-05-1.jsonld
+++ b/doc/test/RSFC-05-1/RSFC-05-1.jsonld
@@ -1,4 +1,31 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
         "http://purl.org/dc/terms/description": [
@@ -20,6 +47,23 @@
             }
         ]
     },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
@@ -41,6 +85,44 @@
             }
         ]
     },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
@@ -194,87 +276,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-05-2/RSFC-05-2.jsonld b/doc/test/RSFC-05-2/RSFC-05-2.jsonld
index 9cb0eea..e6d6934 100644
--- a/doc/test/RSFC-05-2/RSFC-05-2.jsonld
+++ b/doc/test/RSFC-05-2/RSFC-05-2.jsonld
@@ -1,12 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -32,112 +37,92 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@value": "Andres Montero"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is described with rich metadata."
+                "@value": "Software meets domain-relevant community standards."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://purl.org/dc/terms/identifier": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@value": "https://ror.org/02h3v0f81"
             }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@value": "Universidad Politécnica de Madrid"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "https://www.upm.es/"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
@@ -265,19 +250,34 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with rich metadata."
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "F2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     }
diff --git a/doc/test/RSFC-05-3/RSFC-05-3.jsonld b/doc/test/RSFC-05-3/RSFC-05-3.jsonld
index b300ec2..92bc82b 100644
--- a/doc/test/RSFC-05-3/RSFC-05-3.jsonld
+++ b/doc/test/RSFC-05-3/RSFC-05-3.jsonld
@@ -1,12 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -31,6 +36,23 @@
             }
         ]
     },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
@@ -52,6 +74,44 @@
             }
         ]
     },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
@@ -207,73 +267,13 @@
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     }
diff --git a/doc/test/RSFC-06-1/RSFC-06-1.html b/doc/test/RSFC-06-1/RSFC-06-1.html
index 1af24e1..d41e2ff 100644
--- a/doc/test/RSFC-06-1/RSFC-06-1.html
+++ b/doc/test/RSFC-06-1/RSFC-06-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-06-1/RSFC-06-1.jsonld b/doc/test/RSFC-06-1/RSFC-06-1.jsonld
index 7921cf2..0b25529 100644
--- a/doc/test/RSFC-06-1/RSFC-06-1.jsonld
+++ b/doc/test/RSFC-06-1/RSFC-06-1.jsonld
@@ -1,4 +1,110 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-06-1",
         "@type": [
@@ -119,52 +225,6 @@
             }
         ]
     },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
         "http://purl.org/dc/terms/description": [
@@ -187,73 +247,13 @@
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     }
diff --git a/doc/test/RSFC-06-2/RSFC-06-2.jsonld b/doc/test/RSFC-06-2/RSFC-06-2.jsonld
index 561b07f..f0ad208 100644
--- a/doc/test/RSFC-06-2/RSFC-06-2.jsonld
+++ b/doc/test/RSFC-06-2/RSFC-06-2.jsonld
@@ -1,139 +1,139 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is described with rich metadata."
+                "@value": "Software meets domain-relevant community standards."
             }
         ],
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Organization"
         ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
         ],
-        "http://purl.org/dc/terms/identifier": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@value": "https://ror.org/02h3v0f81"
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with rich metadata."
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@value": "Universidad Politécnica de Madrid"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://www.upm.es/"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F2"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     },
diff --git a/doc/test/RSFC-06-3/RSFC-06-3.jsonld b/doc/test/RSFC-06-3/RSFC-06-3.jsonld
index 9e80e6d..ba91ee6 100644
--- a/doc/test/RSFC-06-3/RSFC-06-3.jsonld
+++ b/doc/test/RSFC-06-3/RSFC-06-3.jsonld
@@ -1,4 +1,110 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-06-3",
         "@type": [
@@ -119,52 +225,6 @@
             }
         ]
     },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
         "http://purl.org/dc/terms/description": [
@@ -187,73 +247,13 @@
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     }
diff --git a/doc/test/RSFC-06-4/RSFC-06-4.html b/doc/test/RSFC-06-4/RSFC-06-4.html
deleted file mode 100644
index 09141dd..0000000
--- a/doc/test/RSFC-06-4/RSFC-06-4.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title></title>
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"> 
-    </head>
-    <body>
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
-        <style>
-            .row {
-              margin-bottom: 10px;
-            }
-            .well {
-                margin: 0; 
-                padding: 10px; 
-                min-height: 40px;
-            }
-            .tag_div {
-                margin-right: 10px;
-            }
-            .row-equal { 
-                display: flex; 
-                align-items: stretch; 
-            } 
-            .align-items-center { 
-                display: flex; 
-                align-items: center; 
-            }
-            .flex-space-between { 
-                display: flex; justify-content: space-between; 
-            }
-            .text-separation { 
-                margin-right: 10px; 
-            }   
-        </style>
-        <div class="container">
-            <div class="row">
-                <div class="col-md-12"> 
-                    <button type="button" class="btn btn-primary" onclick="window.location.href='https://oeg-upm.github.io/rsfc/doc/catalog.html#test'" style="position: absolute; top: 10px; right: 10px;">Back</button>
-                    <h1 class="miClase text-center">RSFC-06-4</h1>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if authors have their roles stated in a codemeta.json. This is achieved by looking for authors in the codemeta.json file and checking if all of them have a role assigned. This process follows the codemeta v2 and v3 standards.</p></div>
-            </div>
-            <div class="row flex-space-between"> 
-                <div class="col-md-12 align-items-center"> 
-                    <h4 class="miClase text-left text-separation">TEST INFORMATION</h4> 
-                    <a href="RSFC-06-4.ttl" title="RDF Resource Description
-                    Framework"> <img border="0" src="http://www.w3.org/RDF/icons/rdf_flyer.24"
-                    alt="RDF Resource Description Framework Flyer Icon"/></a>
-                </div> 
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Title</strong></div>
-                <div class="col-md-9 well"> Authors have roles </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Identifier</strong></div>
-                 <div class="col-md-9 well"><a href="https://w3id.org/rsfc/test/RSFC-06-4" target="_blank">https://w3id.org/rsfc/test/RSFC-06-4</a></div>
-                <!-- <div class="col-md-9 well"><a href="https://w3id.org/foops/test/URI1" target="_blank">https://w3id.org/foops/test/URI1</a></div> -->
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>License</strong></div>
-                <div class="col-md-9 well"> <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank"> http://creativecommons.org/licenses/by/4.0/ </a></div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Contact Point</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> at <a href="https://www.upm.es" target="_blank">upm.es</a> </div>
-                <!--  debe añadir el href y el label de todos los creadores. 
-                  <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
-                <!--  debe añadir el href y el label de todos los creadores. 
-                  <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Keywords</strong></div>
-                <div class="col-md-9 well"> Author, Rol, Test </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Publisher</strong></div>
-                 <div class="col-md-9 well"> <a href="https://oeg.fi.upm.es" target="_blank">Ontology Engineering Group</a>, <a href="https://ror.org/03n6nwv02" target="_blank">Universidad Politécnica de Madrid</a> </div>
-                <!-- <div class="col-md-9 well"><a href="" target="_blank"></a></div> -->
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Version</strong></div>
-                <div class="col-md-9 well"> 0.0.1 </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Repository</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/oeg-upm/rsfc" target="_blank"> https://github.com/oeg-upm/rsfc </a> </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Endpoint Desc.</strong></div>
-                <div class="col-md-9 well"> <a href="https://w3id.org/rsfc/api" target="_blank"> https://w3id.org/rsfc/api </a> </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Endpoint URL</strong></div>
-                <div class="col-md-9 well"> <a href="https://api.rsfc.linkeddata.es/assess/test/RSFC-06-4" target="_blank"> https://api.rsfc.linkeddata.es/assess/test/RSFC-06-4 </a> </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"><strong>Principle</strong></div>
-                    <div class="col-md-9 well">
-                        <ul>
-                            <li>
-                                <a href="https://doi.org/10.25504/FAIRsharing.a712f1" target="_blank">F2</a>: Software is described with rich metadata.
-                            </li>
-                            <li>
-                                <a href="https://doi.org/10.25504/FAIRsharing.60a40f" target="_blank">R3</a>: Software meets domain-relevant community standards.
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Applicable for</strong></div>
-                <div class="col-md-9 well"> <a href="https://schema.org/SoftwareSourceCode" target="_blank"> https://schema.org/SoftwareSourceCode </a> </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Supported by</strong></div>
-                <div class="col-md-9 well"> <a href="https://w3id.org/rsfc/" target="_blank"> https://w3id.org/rsfc/ </a> </div>
-            </div>
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Metric</strong></div>
-                <div class="col-md-9 well"> <a href="https://w3id.org/everse/i/indicators/software_documentation" target="_blank"> https://w3id.org/everse/i/indicators/software_documentation </a> </div>
-            </div>                 
-            <div class="row row-equal">
-                <div class="col-md-3 well tag_div"> <strong>Metric same as</strong></div>
-                <div class="col-md-9 well"> <a href="https://doi.org/10.25504/FAIRsharing.452bcd" target="_blank"> https://doi.org/10.25504/FAIRsharing.452bcd </a> </div>
-            </div>
-        </div>
-
-        <div id="pie" class="row" style="margin-top: 20px;">
-            <div class="col-md-12 text-center"">
-              Ontology Engineer Group
-              <a href="https://oeg.fi.upm.es" target="_blank">https://oeg.fi.upm.es</a>
-            </div>
-        </div>
-     </body>
-</html>
\ No newline at end of file
diff --git a/doc/test/RSFC-06-4/RSFC-06-4.jsonld b/doc/test/RSFC-06-4/RSFC-06-4.jsonld
deleted file mode 100644
index ef2aa5d..0000000
--- a/doc/test/RSFC-06-4/RSFC-06-4.jsonld
+++ /dev/null
@@ -1,260 +0,0 @@
-[
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.a712f1",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with rich metadata."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F2"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/test/RSFC-06-4",
-        "@type": [
-            "https://w3id.org/ftr#Test",
-            "http://www.w3.org/ns/dcat#DataService"
-        ],
-        "http://purl.org/dc/terms/creator": [
-            {
-                "@id": "https://orcid.org/0000-0003-0454-7145"
-            },
-            {
-                "@id": "https://github.com/andriumon"
-            }
-        ],
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "This test checks if authors have their roles stated in a codemeta.json. This is achieved by looking for authors in the codemeta.json file and checking if all of them have a role assigned. This process follows the codemeta v2 and v3 standards."
-            }
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://w3id.org/rsfc/test/RSFC-06-4"
-            }
-        ],
-        "http://purl.org/dc/terms/license": [
-            {
-                "@id": "http://creativecommons.org/licenses/by/4.0/"
-            }
-        ],
-        "http://purl.org/dc/terms/publisher": [
-            {
-                "@id": "https://oeg.fi.upm.es"
-            },
-            {
-                "@id": "https://ror.org/03n6nwv02"
-            }
-        ],
-        "http://purl.org/dc/terms/title": [
-            {
-                "@language": "en",
-                "@value": "Authors have roles"
-            }
-        ],
-        "http://semanticscience.org/resource/SIO_000233": [
-            {
-                "@id": "https://w3id.org/everse/i/indicators/software_documentation"
-            }
-        ],
-        "http://usefulinc.com/ns/doap#repository": [
-            {
-                "@id": "https://w3id.org/rsfc/repository"
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "RSFC-06-4"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "RSFC-06-4"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#contactPoint": [
-            {
-                "@id": "https://orcid.org/0000-0003-0454-7145"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#endpointDescription": [
-            {
-                "@id": "https://w3id.org/rsfc/api"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#endpointURL": [
-            {
-                "@id": "https://api.rsfc.linkeddata.es/assess/test/RSFC-06-4"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#keyword": [
-            {
-                "@language": "en",
-                "@value": "Author"
-            },
-            {
-                "@language": "en",
-                "@value": "Rol"
-            },
-            {
-                "@language": "en",
-                "@value": "Test"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#version": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "0.0.1"
-            }
-        ],
-        "http://www.w3.org/ns/dqv#inDimension": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.a712f1"
-            },
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.60a40f"
-            }
-        ],
-        "https://w3id.org/dpv#isApplicableFor": [
-            {
-                "@id": "https://schema.org/SoftwareSourceCode"
-            }
-        ],
-        "https://w3id.org/ftr#supportedBy": [
-            {
-                "@id": "https://w3id.org/rsfc/"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/doc/test/RSFC-07-1/RSFC-07-1.jsonld b/doc/test/RSFC-07-1/RSFC-07-1.jsonld
index bc2dd18..a02c5ab 100644
--- a/doc/test/RSFC-07-1/RSFC-07-1.jsonld
+++ b/doc/test/RSFC-07-1/RSFC-07-1.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier",
         "@type": [
@@ -10,6 +26,61 @@
             }
         ]
     },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-07-1",
         "@type": [
@@ -135,70 +206,23 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://purl.org/dc/terms/identifier": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "https://ror.org/02h3v0f81"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
             }
         ]
     },
@@ -224,40 +248,16 @@
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     }
diff --git a/doc/test/RSFC-07-2/RSFC-07-2.jsonld b/doc/test/RSFC-07-2/RSFC-07-2.jsonld
index 3b95413..ca117c1 100644
--- a/doc/test/RSFC-07-2/RSFC-07-2.jsonld
+++ b/doc/test/RSFC-07-2/RSFC-07-2.jsonld
@@ -1,117 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/rsfc/test/RSFC-07-2",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "https://w3id.org/ftr#Test",
-            "http://www.w3.org/ns/dcat#DataService"
-        ],
-        "http://purl.org/dc/terms/creator": [
-            {
-                "@id": "https://orcid.org/0000-0003-0454-7145"
-            },
-            {
-                "@id": "https://github.com/andriumon"
-            }
-        ],
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "This test checks if the identifier found in the repository resolves back to the source code repository. This is done by checking if the landing page where the identifier resolves to links back to the source code repository using requests."
-            }
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://w3id.org/rsfc/test/RSFC-07-2"
-            }
-        ],
-        "http://purl.org/dc/terms/license": [
-            {
-                "@id": "http://creativecommons.org/licenses/by/4.0/"
-            }
-        ],
-        "http://purl.org/dc/terms/publisher": [
-            {
-                "@id": "https://oeg.fi.upm.es"
-            },
-            {
-                "@id": "https://ror.org/03n6nwv02"
-            }
-        ],
-        "http://purl.org/dc/terms/title": [
-            {
-                "@language": "en",
-                "@value": "Software identifier resolves to software"
-            }
-        ],
-        "http://semanticscience.org/resource/SIO_000233": [
-            {
-                "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier"
-            }
-        ],
-        "http://usefulinc.com/ns/doap#repository": [
-            {
-                "@id": "https://w3id.org/rsfc/repository"
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "RSFC-07-2"
-            }
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "RSFC-07-2"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#contactPoint": [
-            {
-                "@id": "https://orcid.org/0000-0003-0454-7145"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#endpointDescription": [
-            {
-                "@id": "https://w3id.org/rsfc/api"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#endpointURL": [
-            {
-                "@id": "https://api.rsfc.linkeddata.es/assess/test/RSFC-07-2"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#keyword": [
-            {
-                "@language": "en",
-                "@value": "Identifier"
-            },
-            {
-                "@language": "en",
-                "@value": "Test"
-            }
-        ],
-        "http://www.w3.org/ns/dcat#version": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "0.0.1"
-            }
-        ],
-        "http://www.w3.org/ns/dqv#inDimension": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.9d893d"
-            },
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.60a40f"
-            }
-        ],
-        "https://w3id.org/dpv#isApplicableFor": [
-            {
-                "@id": "https://schema.org/SoftwareSourceCode"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "https://w3id.org/ftr#supportedBy": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://w3id.org/rsfc/"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -148,16 +48,19 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -179,18 +82,23 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Organization"
         ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
             }
         ]
     },
@@ -216,40 +124,132 @@
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/test/RSFC-07-2",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "https://w3id.org/ftr#Test",
+            "http://www.w3.org/ns/dcat#DataService"
+        ],
+        "http://purl.org/dc/terms/creator": [
+            {
+                "@id": "https://orcid.org/0000-0003-0454-7145"
+            },
+            {
+                "@id": "https://github.com/andriumon"
+            }
+        ],
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "This test checks if the identifier found in the repository resolves back to the source code repository. This is done by checking if the landing page where the identifier resolves to links back to the source code repository using requests."
+            }
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://ror.org/02h3v0f81"
+                "@value": "https://w3id.org/rsfc/test/RSFC-07-2"
+            }
+        ],
+        "http://purl.org/dc/terms/license": [
+            {
+                "@id": "http://creativecommons.org/licenses/by/4.0/"
+            }
+        ],
+        "http://purl.org/dc/terms/publisher": [
+            {
+                "@id": "https://oeg.fi.upm.es"
+            },
+            {
+                "@id": "https://ror.org/03n6nwv02"
+            }
+        ],
+        "http://purl.org/dc/terms/title": [
+            {
+                "@language": "en",
+                "@value": "Software identifier resolves to software"
+            }
+        ],
+        "http://semanticscience.org/resource/SIO_000233": [
+            {
+                "@id": "https://w3id.org/everse/i/indicators/persistent_and_unique_identifier"
+            }
+        ],
+        "http://usefulinc.com/ns/doap#repository": [
+            {
+                "@id": "https://w3id.org/rsfc/repository"
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "RSFC-07-2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Universidad Politécnica de Madrid"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "RSFC-07-2"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/ns/dcat#contactPoint": [
             {
-                "@id": "https://www.upm.es/"
+                "@id": "https://orcid.org/0000-0003-0454-7145"
             }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://www.w3.org/ns/dcat#endpointDescription": [
+            {
+                "@id": "https://w3id.org/rsfc/api"
+            }
+        ],
+        "http://www.w3.org/ns/dcat#endpointURL": [
+            {
+                "@id": "https://api.rsfc.linkeddata.es/assess/test/RSFC-07-2"
+            }
+        ],
+        "http://www.w3.org/ns/dcat#keyword": [
+            {
+                "@language": "en",
+                "@value": "Identifier"
+            },
+            {
+                "@language": "en",
+                "@value": "Test"
+            }
+        ],
+        "http://www.w3.org/ns/dcat#version": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "0.0.1"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/ns/dqv#inDimension": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://doi.org/10.25504/FAIRsharing.9d893d"
+            },
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.60a40f"
+            }
+        ],
+        "https://w3id.org/dpv#isApplicableFor": [
+            {
+                "@id": "https://schema.org/SoftwareSourceCode"
+            }
+        ],
+        "https://w3id.org/ftr#supportedBy": [
+            {
+                "@id": "https://w3id.org/rsfc/"
             }
         ]
     }
diff --git a/doc/test/RSFC-08-1/RSFC-08-1.html b/doc/test/RSFC-08-1/RSFC-08-1.html
index 2047385..e9fd0ea 100644
--- a/doc/test/RSFC-08-1/RSFC-08-1.html
+++ b/doc/test/RSFC-08-1/RSFC-08-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-08-1/RSFC-08-1.jsonld b/doc/test/RSFC-08-1/RSFC-08-1.jsonld
index d49a76f..e37708f 100644
--- a/doc/test/RSFC-08-1/RSFC-08-1.jsonld
+++ b/doc/test/RSFC-08-1/RSFC-08-1.jsonld
@@ -1,36 +1,49 @@
 [
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://w3id.org/everse/i/indicators/archived_in_software_heritage",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
+                "@id": "https://doi.org/10.25504/FAIRsharing.952c3f"
             }
+        ]
+    },
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
+        "@id": "https://doi.org/10.25504/FAIRsharing.aeef8a",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Metadata are FAIR, searchable and indexable."
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F4"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F4"
             }
         ]
     },
@@ -73,29 +86,40 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/archived_in_software_heritage",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.952c3f"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -121,19 +145,16 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
@@ -259,26 +280,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.aeef8a",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Metadata are FAIR, searchable and indexable."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F4"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F4"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-09-1/RSFC-09-1.html b/doc/test/RSFC-09-1/RSFC-09-1.html
index ecff4f9..61692a4 100644
--- a/doc/test/RSFC-09-1/RSFC-09-1.html
+++ b/doc/test/RSFC-09-1/RSFC-09-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-09-1/RSFC-09-1.jsonld b/doc/test/RSFC-09-1/RSFC-09-1.jsonld
index 99bcc61..804690f 100644
--- a/doc/test/RSFC-09-1/RSFC-09-1.jsonld
+++ b/doc/test/RSFC-09-1/RSFC-09-1.jsonld
@@ -1,4 +1,163 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.aeef8a",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Metadata are FAIR, searchable and indexable."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F4"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "F4"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.b93697",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is retrievable by its identifier using a standardised communications protocol."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "A1"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "A1"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.0c61dd",
         "http://purl.org/dc/terms/description": [
@@ -146,144 +305,6 @@
             }
         ]
     },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.b93697",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is retrievable by its identifier using a standardised communications protocol."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "A1"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "A1"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
-    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.6fff5e",
         "http://purl.org/dc/terms/description": [
@@ -304,26 +325,5 @@
                 "@value": "A1.1"
             }
         ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.aeef8a",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Metadata are FAIR, searchable and indexable."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F4"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "F4"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-12-1/RSFC-12-1.jsonld b/doc/test/RSFC-12-1/RSFC-12-1.jsonld
index 1ed3839..8bfd411 100644
--- a/doc/test/RSFC-12-1/RSFC-12-1.jsonld
+++ b/doc/test/RSFC-12-1/RSFC-12-1.jsonld
@@ -1,15 +1,28 @@
 [
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.c585c5"
             }
         ]
     },
@@ -31,18 +44,75 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Organization"
         ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Ontology Engineering Group"
+                "@value": "Universidad Politécnica de Madrid"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.6d7a69",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software includes qualified references to other objects"
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "I2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "I2"
             }
         ]
     },
@@ -162,75 +232,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.6d7a69",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software includes qualified references to other objects"
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "I2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "I2"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.c585c5"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-13-1/RSFC-13-1.jsonld b/doc/test/RSFC-13-1/RSFC-13-1.jsonld
index 8a3880b..80ad746 100644
--- a/doc/test/RSFC-13-1/RSFC-13-1.jsonld
+++ b/doc/test/RSFC-13-1/RSFC-13-1.jsonld
@@ -1,4 +1,75 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with a plurality of accurate and relevant attributes."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-13-1",
         "@type": [
@@ -115,85 +186,6 @@
             }
         ]
     },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with a plurality of accurate and relevant attributes."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.b8eeb9"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://ror.org/03n6nwv02",
         "@type": [
@@ -216,19 +208,16 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
@@ -252,5 +241,16 @@
                 "@value": "R2"
             }
         ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.b8eeb9"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-13-2/RSFC-13-2.jsonld b/doc/test/RSFC-13-2/RSFC-13-2.jsonld
index 79df5fe..cfa2588 100644
--- a/doc/test/RSFC-13-2/RSFC-13-2.jsonld
+++ b/doc/test/RSFC-13-2/RSFC-13-2.jsonld
@@ -1,47 +1,17 @@
 [
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@id": "https://oeg.fi.upm.es",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with a plurality of accurate and relevant attributes."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -161,6 +131,27 @@
             }
         ]
     },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with a plurality of accurate and relevant attributes."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ]
+    },
     {
         "@id": "https://github.com/andriumon",
         "@type": [
@@ -179,18 +170,30 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/software_documentation",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.452bcd"
             }
         ]
     },
@@ -216,19 +219,16 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
diff --git a/doc/test/RSFC-13-3/RSFC-13-3.html b/doc/test/RSFC-13-3/RSFC-13-3.html
index 850561f..31dc79e 100644
--- a/doc/test/RSFC-13-3/RSFC-13-3.html
+++ b/doc/test/RSFC-13-3/RSFC-13-3.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-13-3/RSFC-13-3.jsonld b/doc/test/RSFC-13-3/RSFC-13-3.jsonld
index e967d92..54f72d3 100644
--- a/doc/test/RSFC-13-3/RSFC-13-3.jsonld
+++ b/doc/test/RSFC-13-3/RSFC-13-3.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
         "http://purl.org/dc/terms/description": [
@@ -21,60 +37,47 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
             }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.b8eeb9"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
             "http://www.w3.org/2006/vcard/ns#Individual"
         ],
         "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "Daniel Garijo"
             }
         ],
         "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://doi.org/10.25504/FAIRsharing.b8eeb9"
             }
         ]
     },
@@ -99,6 +102,41 @@
             }
         ]
     },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.cda381",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software includes qualified references to other software."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R2"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-13-3",
         "@type": [
@@ -218,43 +256,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.cda381",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software includes qualified references to other software."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R2"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-13-4/RSFC-13-4.jsonld b/doc/test/RSFC-13-4/RSFC-13-4.jsonld
index bbce1ae..3346671 100644
--- a/doc/test/RSFC-13-4/RSFC-13-4.jsonld
+++ b/doc/test/RSFC-13-4/RSFC-13-4.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
         "http://purl.org/dc/terms/description": [
@@ -21,44 +37,57 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.b8eeb9"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
+        "@id": "https://ror.org/03n6nwv02",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://purl.org/dc/terms/identifier": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "https://ror.org/02h3v0f81"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
             }
         ]
     },
@@ -179,56 +208,16 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
@@ -252,5 +241,16 @@
                 "@value": "R2"
             }
         ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/requirements_specified",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.b8eeb9"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-14-1/RSFC-14-1.jsonld b/doc/test/RSFC-14-1/RSFC-14-1.jsonld
index 45234d3..ec98769 100644
--- a/doc/test/RSFC-14-1/RSFC-14-1.jsonld
+++ b/doc/test/RSFC-14-1/RSFC-14-1.jsonld
@@ -1,67 +1,4 @@
 [
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with a plurality of accurate and relevant attributes."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_tests",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.a2dd1a"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
     {
         "@id": "https://oeg.fi.upm.es",
         "@type": [
@@ -78,27 +15,6 @@
             }
         ]
     },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-14-1",
         "@type": [
@@ -212,6 +128,55 @@
             }
         ]
     },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/software_has_tests",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.a2dd1a"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is described with a plurality of accurate and relevant attributes."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
@@ -228,5 +193,40 @@
                 "@id": "mailto:dgarijo@upm.es"
             }
         ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-14-2/RSFC-14-2.html b/doc/test/RSFC-14-2/RSFC-14-2.html
index 37c8785..aa8f19d 100644
--- a/doc/test/RSFC-14-2/RSFC-14-2.html
+++ b/doc/test/RSFC-14-2/RSFC-14-2.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-14-2/RSFC-14-2.jsonld b/doc/test/RSFC-14-2/RSFC-14-2.jsonld
index 2d0a4d5..c29fa64 100644
--- a/doc/test/RSFC-14-2/RSFC-14-2.jsonld
+++ b/doc/test/RSFC-14-2/RSFC-14-2.jsonld
@@ -1,22 +1,17 @@
 [
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is described with a plurality of accurate and relevant attributes."
-            }
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -32,16 +27,23 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
+        "@id": "https://doi.org/10.25504/FAIRsharing.9bf822",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Software is described with a plurality of accurate and relevant attributes."
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1"
             }
         ]
     },
@@ -63,18 +65,19 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -217,19 +220,16 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     }
diff --git a/doc/test/RSFC-15-1/RSFC-15-1.html b/doc/test/RSFC-15-1/RSFC-15-1.html
index df5dad2..82c43a4 100644
--- a/doc/test/RSFC-15-1/RSFC-15-1.html
+++ b/doc/test/RSFC-15-1/RSFC-15-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-15-1/RSFC-15-1.jsonld b/doc/test/RSFC-15-1/RSFC-15-1.jsonld
index 35e30f6..0433907 100644
--- a/doc/test/RSFC-15-1/RSFC-15-1.jsonld
+++ b/doc/test/RSFC-15-1/RSFC-15-1.jsonld
@@ -1,36 +1,83 @@
 [
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.95c69f",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@language": "en",
-                "@value": "Software is given a clear and accessible licence."
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://fairsharing.org/6451"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.1"
+                "@value": "Andres Montero"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.1"
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "https://ror.org/02h3v0f81"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
             }
         ]
     },
@@ -148,84 +195,37 @@
         ]
     },
     {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
             {
-                "@value": "Ontology Engineering Group"
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "@id": "https://doi.org/10.25504/FAIRsharing.95c69f",
+        "http://purl.org/dc/terms/description": [
             {
-                "@id": "https://fairsharing.org/6451"
+                "@language": "en",
+                "@value": "Software is given a clear and accessible licence."
             }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
-        "http://purl.org/dc/terms/identifier": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@value": "https://ror.org/02h3v0f81"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1.1"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
+                "@value": "R1.1"
             }
         ]
     }
diff --git a/doc/test/RSFC-15-2/RSFC-15-2.jsonld b/doc/test/RSFC-15-2/RSFC-15-2.jsonld
index 65e03c4..44defda 100644
--- a/doc/test/RSFC-15-2/RSFC-15-2.jsonld
+++ b/doc/test/RSFC-15-2/RSFC-15-2.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-15-2",
         "@type": [
@@ -117,37 +133,13 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.95c69f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is given a clear and accessible licence."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.1"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.1"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
+        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "https://fairsharing.org/6451"
             }
         ]
     },
@@ -169,29 +161,19 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://fairsharing.org/6451"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -217,19 +199,37 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.95c69f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is given a clear and accessible licence."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "R1.1"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1.1"
             }
         ]
     }
diff --git a/doc/test/RSFC-16-1/RSFC-16-1.jsonld b/doc/test/RSFC-16-1/RSFC-16-1.jsonld
index 0e04ae5..3067a0e 100644
--- a/doc/test/RSFC-16-1/RSFC-16-1.jsonld
+++ b/doc/test/RSFC-16-1/RSFC-16-1.jsonld
@@ -1,4 +1,100 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://fairsharing.org/6451"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://doi.org/10.25504/FAIRsharing.95c69f",
         "http://purl.org/dc/terms/description": [
@@ -144,101 +240,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_license",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://fairsharing.org/6451"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-17-1/RSFC-17-1.ttl b/doc/test/RSFC-17-1/RSFC-17-1.ttl
deleted file mode 100644
index 4abfe1c..0000000
--- a/doc/test/RSFC-17-1/RSFC-17-1.ttl
+++ /dev/null
@@ -1,58 +0,0 @@
-@prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
-@prefix ftr: <https://w3id.org/ftr#> .
-@prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix doap: <http://usefulinc.com/ns/doap#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dqv: <http://www.w3.org/ns/dqv#> .
-@prefix vivo: <http://vivoweb.org/ontology/core#> .
-@prefix dpv: <https://w3id.org/dpv#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-
-
-<https://w3id.org/rsfc/test/RSFC-17-1> a ftr:Test, dcat:DataService ;
-    dcat:contactPoint <https://orcid.org/0000-0003-0454-7145> ;
-    dcterms:creator <https://orcid.org/0000-0003-0454-7145> ,
-                    <https://github.com/andriumon> ;
-    dcterms:title "Repository active"@en ;
-    rdfs:label "RSFC-17-1"^^xsd:string ;
-    vivo:abbreviation "RSFC-17-1"^^xsd:string ;
-    dcterms:license <http://creativecommons.org/licenses/by/4.0/> ;
-    dcterms:description """This test checks whether the repository is active. It first looks for a repostatus badge with the value “Active” in the README file. If the badge is not present, the test verifies whether there have been any commits to the repository in the past, indicating ongoing development."""@en ;
-    dcterms:publisher <https://oeg.fi.upm.es> ,
-                      <https://ror.org/03n6nwv02> ;
-	dqv:inDimension  <https://doi.org/10.25504/FAIRsharing.9ca8a1>;
-    dcat:version "0.0.1"^^xsd:string ;
-    dcterms:identifier "https://w3id.org/rsfc/test/RSFC-17-1" ;
-    dcat:keyword "Active"@en , "Repository"@en , 
-                 "Test"@en ;
-    dcat:endpointDescription <https://w3id.org/rsfc/api> ;
-    dcat:endpointURL <https://api.rsfc.linkeddata.es/assess/test/RSFC-17-1> ;
-    dpv:isApplicableFor <https://schema.org/SoftwareSourceCode> ;
-    ftr:supportedBy <https://w3id.org/rsfc/> ;
-    <http://semanticscience.org/resource/SIO_000233> <https://w3id.org/everse/i/indicators/version_control_use> ; 
-    doap:repository <https://w3id.org/rsfc/repository> .
-<https://orcid.org/0000-0003-0454-7145> a vcard:Individual ;
-    vcard:fn "Daniel Garijo"^^xsd:string ;
-    vcard:hasEmail <mailto:dgarijo@upm.es> .
-<https://github.com/andriumon> a vcard:Individual ;
-    vcard:fn "Andres Montero"^^xsd:string ;
-    vcard:hasEmail <mailto:andres.montero.martin@upm.es> .
-<https://doi.org/10.25504/FAIRsharing.9ca8a1> 
-	rdfs:label "R1.2"^^xsd:string ;
-	vivo:abbreviation "R1.2"^^xsd:string ;
-	dcterms:description "Software is associated with detailed provenance."@en .
-<https://oeg.fi.upm.es> a vcard:Organization ;
-    rdfs:label "Ontology Engineering Group" ;
-    vcard:url <https://oeg.fi.upm.es/> .
-<https://ror.org/03n6nwv02> a vcard:Organization ;
-    dcterms:identifier "https://ror.org/02h3v0f81" ;
-    rdfs:label "Universidad Politécnica de Madrid" ;
-    vcard:url <https://www.upm.es/> .
-<https://w3id.org/rsfc/repository>
-    foaf:homePage <https://github.com/oeg-upm/rsfc> ;
-    dcterms:description "Main repository for Research Software Quality Checks (RSFC) code and documentation"@en .
-<https://w3id.org/everse/i/indicators/version_control_use> a dqv:Metric ;
-    owl:sameAs <https://doi.org/10.25504/FAIRsharing.d2b2c5> .
\ No newline at end of file
diff --git a/doc/test/RSFC-17-2/RSFC-17-2.html b/doc/test/RSFC-17-2/RSFC-17-2.html
index aca366a..fd4e711 100644
--- a/doc/test/RSFC-17-2/RSFC-17-2.html
+++ b/doc/test/RSFC-17-2/RSFC-17-2.html
@@ -42,7 +42,7 @@ <h1 class="miClase text-center">RSFC-17-2</h1>
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if the repository has a commit history. This is done by looking for commits in the software’s repository.</p></div>
+                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if the repository has a commit history within a 90 day timeframe. This is done by looking for commits in the software’s repository.</p></div>
             </div>
             <div class="row flex-space-between"> 
                 <div class="col-md-12 align-items-center"> 
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-17-2/RSFC-17-2.jsonld b/doc/test/RSFC-17-2/RSFC-17-2.jsonld
index fd877f3..b1bb50e 100644
--- a/doc/test/RSFC-17-2/RSFC-17-2.jsonld
+++ b/doc/test/RSFC-17-2/RSFC-17-2.jsonld
@@ -1,15 +1,83 @@
 [
     {
-        "@id": "https://w3id.org/rsfc/repository",
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.9ca8a1",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Software is associated with detailed provenance."
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1.2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1.2"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -30,7 +98,7 @@
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "This test checks if the repository has a commit history. This is done by looking for commits in the software’s repository."
+                "@value": "This test checks if the repository has a commit history within a 90 day timeframe. This is done by looking for commits in the software’s repository."
             }
         ],
         "http://purl.org/dc/terms/identifier": [
@@ -130,50 +198,6 @@
             }
         ]
     },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://ror.org/03n6nwv02",
         "@type": [
@@ -196,40 +220,16 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9ca8a1",
+        "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is associated with detailed provenance."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.2"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     }
diff --git a/doc/test/RSFC-17-2/RSFC-17-2.ttl b/doc/test/RSFC-17-2/RSFC-17-2.ttl
index 7f94fb7..5730c03 100644
--- a/doc/test/RSFC-17-2/RSFC-17-2.ttl
+++ b/doc/test/RSFC-17-2/RSFC-17-2.ttl
@@ -20,7 +20,7 @@
     rdfs:label "RSFC-17-2"^^xsd:string ;
     vivo:abbreviation "RSFC-17-2"^^xsd:string ;
     dcterms:license <http://creativecommons.org/licenses/by/4.0/> ;
-    dcterms:description """This test checks if the repository has a commit history. This is done by looking for commits in the software’s repository."""@en ;
+    dcterms:description """This test checks if the repository has a commit history within a 90 day timeframe. This is done by looking for commits in the software’s repository."""@en ;
     dcterms:publisher <https://oeg.fi.upm.es> ,
                       <https://ror.org/03n6nwv02> ;
     dcat:version "0.0.1"^^xsd:string ;
diff --git a/doc/test/RSFC-17-3/RSFC-17-3.html b/doc/test/RSFC-17-3/RSFC-17-3.html
index 3e8d35d..145f0ab 100644
--- a/doc/test/RSFC-17-3/RSFC-17-3.html
+++ b/doc/test/RSFC-17-3/RSFC-17-3.html
@@ -42,7 +42,7 @@ <h1 class="miClase text-center">RSFC-17-3</h1>
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if the repository has commits that are linked to open and closed issues. This is done by cross-checking if issue identifiers within the issue list are present in the commit history’s messages (i.e. “closes #123”).</p></div>
+                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if the repository has commits that are linked to open and closed issues. This is done by cross-checking if issue identifiers within the issue list are present in the commit history’s messages within a 90 day timeframe (i.e. “closes #123”).</p></div>
             </div>
             <div class="row flex-space-between"> 
                 <div class="col-md-12 align-items-center"> 
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-17-3/RSFC-17-3.jsonld b/doc/test/RSFC-17-3/RSFC-17-3.jsonld
index 68feca3..b892400 100644
--- a/doc/test/RSFC-17-3/RSFC-17-3.jsonld
+++ b/doc/test/RSFC-17-3/RSFC-17-3.jsonld
@@ -1,4 +1,121 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.9ca8a1",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software is associated with detailed provenance."
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1.2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R1.2"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
+        ],
+        "http://www.w3.org/2002/07/owl#sameAs": [
+            {
+                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
+            }
+        ]
+    },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:dgarijo@upm.es"
+            }
+        ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-17-3",
         "@type": [
@@ -16,7 +133,7 @@
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "This test checks if the repository has commits that are linked to open and closed issues. This is done by cross-checking if issue identifiers within the issue list are present in the commit history’s messages (i.e. “closes #123”)."
+                "@value": "This test checks if the repository has commits that are linked to open and closed issues. This is done by cross-checking if issue identifiers within the issue list are present in the commit history’s messages within a 90 day timeframe (i.e. “closes #123”)."
             }
         ],
         "http://purl.org/dc/terms/identifier": [
@@ -115,122 +232,5 @@
                 "@id": "https://w3id.org/rsfc/"
             }
         ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
-    {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Ontology Engineering Group"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://oeg.fi.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9ca8a1",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software is associated with detailed provenance."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.2"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.2"
-            }
-        ]
-    },
-    {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:dgarijo@upm.es"
-            }
-        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-17-3/RSFC-17-3.ttl b/doc/test/RSFC-17-3/RSFC-17-3.ttl
index aa8f334..fe24a92 100644
--- a/doc/test/RSFC-17-3/RSFC-17-3.ttl
+++ b/doc/test/RSFC-17-3/RSFC-17-3.ttl
@@ -20,7 +20,7 @@
     rdfs:label "RSFC-17-3"^^xsd:string ;
     vivo:abbreviation "RSFC-17-3"^^xsd:string ;
     dcterms:license <http://creativecommons.org/licenses/by/4.0/> ;
-    dcterms:description """This test checks if the repository has commits that are linked to open and closed issues. This is done by cross-checking if issue identifiers within the issue list are present in the commit history’s messages (i.e. “closes #123”)."""@en ;
+    dcterms:description """This test checks if the repository has commits that are linked to open and closed issues. This is done by cross-checking if issue identifiers within the issue list are present in the commit history’s messages within a 90 day timeframe (i.e. “closes #123”)."""@en ;
     dcterms:publisher <https://oeg.fi.upm.es> ,
                       <https://ror.org/03n6nwv02> ;
     dcat:version "0.0.1"^^xsd:string ;
diff --git a/doc/test/RSFC-18-1/RSFC-18-1.html b/doc/test/RSFC-18-1/RSFC-18-1.html
index edcef71..b57e581 100644
--- a/doc/test/RSFC-18-1/RSFC-18-1.html
+++ b/doc/test/RSFC-18-1/RSFC-18-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-18-1/RSFC-18-1.jsonld b/doc/test/RSFC-18-1/RSFC-18-1.jsonld
index 1b84627..4e03508 100644
--- a/doc/test/RSFC-18-1/RSFC-18-1.jsonld
+++ b/doc/test/RSFC-18-1/RSFC-18-1.jsonld
@@ -1,46 +1,4 @@
 [
-    {
-        "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
-            {
-                "@id": "https://doi.org/10.25504/FAIRsharing.c585c5"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/homePage": [
-            {
-                "@id": "https://github.com/oeg-upm/rsfc"
-            }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
-            {
-                "@id": "mailto:andres.montero.martin@upm.es"
-            }
-        ]
-    },
     {
         "@id": "https://oeg.fi.upm.es",
         "@type": [
@@ -58,44 +16,13 @@
         ]
     },
     {
-        "@id": "https://ror.org/03n6nwv02",
+        "@id": "https://w3id.org/everse/i/indicators/software_has_citation",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
-    {
-        "@id": "https://doi.org/10.25504/FAIRsharing.6d7a69",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software includes qualified references to other objects"
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "I2"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "I2"
+                "@id": "https://doi.org/10.25504/FAIRsharing.c585c5"
             }
         ]
     },
@@ -216,6 +143,23 @@
             }
         ]
     },
+    {
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+            {
+                "@id": "mailto:andres.montero.martin@upm.es"
+            }
+        ]
+    },
     {
         "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
@@ -232,5 +176,61 @@
                 "@id": "mailto:dgarijo@upm.es"
             }
         ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
+    },
+    {
+        "@id": "https://doi.org/10.25504/FAIRsharing.6d7a69",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software includes qualified references to other objects"
+            }
+        ],
+        "http://vivoweb.org/ontology/core#abbreviation": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "I2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "I2"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-19-1/RSFC-19-1.html b/doc/test/RSFC-19-1/RSFC-19-1.html
index 51eb1f7..779b07b 100644
--- a/doc/test/RSFC-19-1/RSFC-19-1.html
+++ b/doc/test/RSFC-19-1/RSFC-19-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
diff --git a/doc/test/RSFC-19-1/RSFC-19-1.jsonld b/doc/test/RSFC-19-1/RSFC-19-1.jsonld
index e78099b..6252c5e 100644
--- a/doc/test/RSFC-19-1/RSFC-19-1.jsonld
+++ b/doc/test/RSFC-19-1/RSFC-19-1.jsonld
@@ -1,36 +1,17 @@
 [
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Software meets domain-relevant community standards"
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R3"
-            }
-        ]
-    },
-    {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
-            {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@value": "Ontology Engineering Group"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#url": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "https://oeg.fi.upm.es/"
             }
         ]
     },
@@ -52,18 +33,23 @@
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards"
+            }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
             }
         ]
     },
@@ -78,27 +64,6 @@
             }
         ]
     },
-    {
-        "@id": "https://ror.org/03n6nwv02",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
-        ],
-        "http://purl.org/dc/terms/identifier": [
-            {
-                "@value": "https://ror.org/02h3v0f81"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Universidad Politécnica de Madrid"
-            }
-        ],
-        "http://www.w3.org/2006/vcard/ns#url": [
-            {
-                "@id": "https://www.upm.es/"
-            }
-        ]
-    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-19-1",
         "@type": [
@@ -232,5 +197,40 @@
                 "@id": "mailto:dgarijo@upm.es"
             }
         ]
+    },
+    {
+        "@id": "https://ror.org/03n6nwv02",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://purl.org/dc/terms/identifier": [
+            {
+                "@value": "https://ror.org/02h3v0f81"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Universidad Politécnica de Madrid"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://www.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/homePage": [
+            {
+                "@id": "https://github.com/oeg-upm/rsfc"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/doc/test/RSFC-20-1/RSFC-20-1.html b/doc/test/RSFC-20-1/RSFC-20-1.html
index 7ce16ac..1cd3c39 100644
--- a/doc/test/RSFC-20-1/RSFC-20-1.html
+++ b/doc/test/RSFC-20-1/RSFC-20-1.html
@@ -73,7 +73,7 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
+                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
@@ -106,6 +106,9 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
                 <div class="col-md-3 well tag_div"><strong>Principle</strong></div>
                     <div class="col-md-9 well">
                         <ul>
+                            <li>
+                                <a href="https://doi.org/10.25504/FAIRsharing.60a40f" target="_blank">R3</a>: Software meets domain-relevant community standards
+                            </li>
                         </ul>
                     </div>
                 </div>
diff --git a/doc/test/RSFC-20-1/RSFC-20-1.jsonld b/doc/test/RSFC-20-1/RSFC-20-1.jsonld
index ca00d51..52abe01 100644
--- a/doc/test/RSFC-20-1/RSFC-20-1.jsonld
+++ b/doc/test/RSFC-20-1/RSFC-20-1.jsonld
@@ -1,4 +1,20 @@
 [
+    {
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
     {
         "@id": "https://w3id.org/rsfc/test/RSFC-20-1",
         "@type": [
@@ -43,6 +59,11 @@
                 "@value": "Repository has an issue tracker"
             }
         ],
+        "http://semanticscience.org/resource/SIO_000233": [
+            {
+                "@id": "https://w3id.org/everse/i/indicators/support_issue_tracking"
+            }
+        ],
         "http://usefulinc.com/ns/doap#repository": [
             {
                 "@id": "https://w3id.org/rsfc/repository"
@@ -112,60 +133,57 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/support_issue_tracking",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
             {
-                "@id": "https://fairsharing.org/8319"
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards"
             }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "R3"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -191,19 +209,27 @@
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
+        "@id": "https://w3id.org/rsfc/repository",
+        "http://purl.org/dc/terms/description": [
+            {
+                "@language": "en",
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+            }
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/everse/i/indicators/support_issue_tracking",
+        "@type": [
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://fairsharing.org/8319"
             }
         ]
     }
diff --git a/doc/test/RSFC-20-1/RSFC-20-1.ttl b/doc/test/RSFC-20-1/RSFC-20-1.ttl
index c3b4f0c..2565796 100644
--- a/doc/test/RSFC-20-1/RSFC-20-1.ttl
+++ b/doc/test/RSFC-20-1/RSFC-20-1.ttl
@@ -32,6 +32,7 @@
     dcat:endpointURL <https://api.rsfc.linkeddata.es/assess/test/RSFC-20-1> ;
     dpv:isApplicableFor <https://schema.org/SoftwareSourceCode> ;
     ftr:supportedBy <https://w3id.org/rsfc/> ;
+    <http://semanticscience.org/resource/SIO_000233> <https://w3id.org/everse/i/indicators/support_issue_tracking> ; 
     doap:repository <https://w3id.org/rsfc/repository> .
 <https://orcid.org/0000-0003-0454-7145> a vcard:Individual ;
     vcard:fn "Daniel Garijo"^^xsd:string ;
@@ -39,6 +40,10 @@
 <https://github.com/andriumon> a vcard:Individual ;
     vcard:fn "Andres Montero"^^xsd:string ;
     vcard:hasEmail <mailto:andres.montero.martin@upm.es> .
+<https://doi.org/10.25504/FAIRsharing.60a40f> 
+	rdfs:label "R3"^^xsd:string ;
+	vivo:abbreviation "R3"^^xsd:string ;
+	dcterms:description "Software meets domain-relevant community standards"@en .
 <https://oeg.fi.upm.es> a vcard:Organization ;
     rdfs:label "Ontology Engineering Group" ;
     vcard:url <https://oeg.fi.upm.es/> .
diff --git a/doc/test/RSFC-17-1/RSFC-17-1.html b/doc/test/RSFC-22-1/RSFC-22-1.html
similarity index 83%
rename from doc/test/RSFC-17-1/RSFC-17-1.html
rename to doc/test/RSFC-22-1/RSFC-22-1.html
index feb9f11..91237cc 100644
--- a/doc/test/RSFC-17-1/RSFC-17-1.html
+++ b/doc/test/RSFC-22-1/RSFC-22-1.html
@@ -38,27 +38,27 @@
             <div class="row">
                 <div class="col-md-12"> 
                     <button type="button" class="btn btn-primary" onclick="window.location.href='https://oeg-upm.github.io/rsfc/doc/catalog.html#test'" style="position: absolute; top: 10px; right: 10px;">Back</button>
-                    <h1 class="miClase text-center">RSFC-17-1</h1>
+                    <h1 class="miClase text-center">RSFC-22-1</h1>
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks whether the repository is active. It first looks for a repostatus badge with the value “Active” in the README file. If the badge is not present, the test verifies whether there have been any commits to the repository in the past, indicating ongoing development.</p></div>
+                <div class="col-md-12 well" style="font-size: 18px;"> <p>This test checks if there is a container file in the repository. This is done by checking if there is any container build type file (i.e Dockerfile, Podman, Apptainer)  in the repository’s root.</p></div>
             </div>
             <div class="row flex-space-between"> 
                 <div class="col-md-12 align-items-center"> 
                     <h4 class="miClase text-left text-separation">TEST INFORMATION</h4> 
-                    <a href="RSFC-17-1.ttl" title="RDF Resource Description
+                    <a href="RSFC-22-1.ttl" title="RDF Resource Description
                     Framework"> <img border="0" src="http://www.w3.org/RDF/icons/rdf_flyer.24"
                     alt="RDF Resource Description Framework Flyer Icon"/></a>
                 </div> 
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Title</strong></div>
-                <div class="col-md-9 well"> Repository active </div>
+                <div class="col-md-9 well"> Software is containerized </div>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Identifier</strong></div>
-                 <div class="col-md-9 well"><a href="https://w3id.org/rsfc/test/RSFC-17-1" target="_blank">https://w3id.org/rsfc/test/RSFC-17-1</a></div>
+                 <div class="col-md-9 well"><a href="https://w3id.org/rsfc/test/RSFC-22-1" target="_blank">https://w3id.org/rsfc/test/RSFC-22-1</a></div>
                 <!-- <div class="col-md-9 well"><a href="https://w3id.org/foops/test/URI1" target="_blank">https://w3id.org/foops/test/URI1</a></div> -->
             </div>
             <div class="row row-equal">
@@ -73,13 +73,13 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Creator</strong></div>
-                <div class="col-md-9 well"> <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://github.com/andriumon" target="_blank">Andres Montero</a> </div>
+                <div class="col-md-9 well"> <a href="https://github.com/andriumon" target="_blank">Andres Montero</a>, <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a> </div>
                 <!--  debe añadir el href y el label de todos los creadores. 
                   <a href="https://orcid.org/0000-0003-0454-7145" target="_blank">Daniel Garijo</a>, <a href="https://orcid.org/0000-0003-3587-0367" target="_blank">María Poveda</a>  -->
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Keywords</strong></div>
-                <div class="col-md-9 well"> Active, Repository, Test </div>
+                <div class="col-md-9 well"> Containerized, Repository, Test </div>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Publisher</strong></div>
@@ -100,14 +100,14 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Endpoint URL</strong></div>
-                <div class="col-md-9 well"> <a href="https://api.rsfc.linkeddata.es/assess/test/RSFC-17-1" target="_blank"> https://api.rsfc.linkeddata.es/assess/test/RSFC-17-1 </a> </div>
+                <div class="col-md-9 well"> <a href="https://api.rsfc.linkeddata.es/assess/test/RSFC-22-1" target="_blank"> https://api.rsfc.linkeddata.es/assess/test/RSFC-22-1 </a> </div>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"><strong>Principle</strong></div>
                     <div class="col-md-9 well">
                         <ul>
                             <li>
-                                <a href="https://doi.org/10.25504/FAIRsharing.9ca8a1" target="_blank">R1.2</a>: Software is associated with detailed provenance.
+                                <a href="https://doi.org/10.25504/FAIRsharing.60a40f" target="_blank">R3</a>: Software meets domain-relevant community standards
                             </li>
                         </ul>
                     </div>
@@ -122,11 +122,11 @@ <h4 class="miClase text-left text-separation">TEST INFORMATION</h4>
             </div>
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Metric</strong></div>
-                <div class="col-md-9 well"> <a href="https://w3id.org/everse/i/indicators/version_control_use" target="_blank"> https://w3id.org/everse/i/indicators/version_control_use </a> </div>
+                <div class="col-md-9 well"> <a href="https://w3id.org/everse/i/indicators/software_is_containerized" target="_blank"> https://w3id.org/everse/i/indicators/software_is_containerized </a> </div>
             </div>                 
             <div class="row row-equal">
                 <div class="col-md-3 well tag_div"> <strong>Metric same as</strong></div>
-                <div class="col-md-9 well"> <a href="https://doi.org/10.25504/FAIRsharing.d2b2c5" target="_blank"> https://doi.org/10.25504/FAIRsharing.d2b2c5 </a> </div>
+                <div class="col-md-9 well"> <a href="https://fairsharing.org/8338" target="_blank"> https://fairsharing.org/8338 </a> </div>
             </div>
         </div>
 
diff --git a/doc/test/RSFC-17-1/RSFC-17-1.jsonld b/doc/test/RSFC-22-1/RSFC-22-1.jsonld
similarity index 84%
rename from doc/test/RSFC-17-1/RSFC-17-1.jsonld
rename to doc/test/RSFC-22-1/RSFC-22-1.jsonld
index f6b5dfb..2930ccb 100644
--- a/doc/test/RSFC-17-1/RSFC-17-1.jsonld
+++ b/doc/test/RSFC-22-1/RSFC-22-1.jsonld
@@ -1,6 +1,22 @@
 [
     {
-        "@id": "https://w3id.org/rsfc/test/RSFC-17-1",
+        "@id": "https://oeg.fi.upm.es",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Organization"
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Ontology Engineering Group"
+            }
+        ],
+        "http://www.w3.org/2006/vcard/ns#url": [
+            {
+                "@id": "https://oeg.fi.upm.es/"
+            }
+        ]
+    },
+    {
+        "@id": "https://w3id.org/rsfc/test/RSFC-22-1",
         "@type": [
             "https://w3id.org/ftr#Test",
             "http://www.w3.org/ns/dcat#DataService"
@@ -16,12 +32,12 @@
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "This test checks whether the repository is active. It first looks for a repostatus badge with the value “Active” in the README file. If the badge is not present, the test verifies whether there have been any commits to the repository in the past, indicating ongoing development."
+                "@value": "This test checks if there is a container file in the repository. This is done by checking if there is any container build type file (i.e Dockerfile, Podman, Apptainer)  in the repository’s root."
             }
         ],
         "http://purl.org/dc/terms/identifier": [
             {
-                "@value": "https://w3id.org/rsfc/test/RSFC-17-1"
+                "@value": "https://w3id.org/rsfc/test/RSFC-22-1"
             }
         ],
         "http://purl.org/dc/terms/license": [
@@ -40,12 +56,12 @@
         "http://purl.org/dc/terms/title": [
             {
                 "@language": "en",
-                "@value": "Repository active"
+                "@value": "Software is containerized"
             }
         ],
         "http://semanticscience.org/resource/SIO_000233": [
             {
-                "@id": "https://w3id.org/everse/i/indicators/version_control_use"
+                "@id": "https://w3id.org/everse/i/indicators/software_is_containerized"
             }
         ],
         "http://usefulinc.com/ns/doap#repository": [
@@ -56,13 +72,13 @@
         "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "RSFC-17-1"
+                "@value": "RSFC-22-1"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "RSFC-17-1"
+                "@value": "RSFC-22-1"
             }
         ],
         "http://www.w3.org/ns/dcat#contactPoint": [
@@ -77,13 +93,13 @@
         ],
         "http://www.w3.org/ns/dcat#endpointURL": [
             {
-                "@id": "https://api.rsfc.linkeddata.es/assess/test/RSFC-17-1"
+                "@id": "https://api.rsfc.linkeddata.es/assess/test/RSFC-22-1"
             }
         ],
         "http://www.w3.org/ns/dcat#keyword": [
             {
                 "@language": "en",
-                "@value": "Active"
+                "@value": "Containerized"
             },
             {
                 "@language": "en",
@@ -102,7 +118,7 @@
         ],
         "http://www.w3.org/ns/dqv#inDimension": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.9ca8a1"
+                "@id": "https://doi.org/10.25504/FAIRsharing.60a40f"
             }
         ],
         "https://w3id.org/dpv#isApplicableFor": [
@@ -117,60 +133,57 @@
         ]
     },
     {
-        "@id": "https://w3id.org/rsfc/repository",
-        "http://purl.org/dc/terms/description": [
+        "@id": "https://github.com/andriumon",
+        "@type": [
+            "http://www.w3.org/2006/vcard/ns#Individual"
+        ],
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@language": "en",
-                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Andres Montero"
             }
         ],
-        "http://xmlns.com/foaf/0.1/homePage": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://github.com/oeg-upm/rsfc"
+                "@id": "mailto:andres.montero.martin@upm.es"
             }
         ]
     },
     {
-        "@id": "https://w3id.org/everse/i/indicators/version_control_use",
-        "@type": [
-            "http://www.w3.org/ns/dqv#Metric"
-        ],
-        "http://www.w3.org/2002/07/owl#sameAs": [
+        "@id": "https://doi.org/10.25504/FAIRsharing.60a40f",
+        "http://purl.org/dc/terms/description": [
             {
-                "@id": "https://doi.org/10.25504/FAIRsharing.d2b2c5"
+                "@language": "en",
+                "@value": "Software meets domain-relevant community standards"
             }
-        ]
-    },
-    {
-        "@id": "https://github.com/andriumon",
-        "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
+        "http://vivoweb.org/ontology/core#abbreviation": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Andres Montero"
+                "@value": "R3"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "mailto:andres.montero.martin@upm.es"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "R3"
             }
         ]
     },
     {
-        "@id": "https://oeg.fi.upm.es",
+        "@id": "https://orcid.org/0000-0003-0454-7145",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Organization"
+            "http://www.w3.org/2006/vcard/ns#Individual"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2006/vcard/ns#fn": [
             {
-                "@value": "Ontology Engineering Group"
+                "@type": "http://www.w3.org/2001/XMLSchema#string",
+                "@value": "Daniel Garijo"
             }
         ],
-        "http://www.w3.org/2006/vcard/ns#url": [
+        "http://www.w3.org/2006/vcard/ns#hasEmail": [
             {
-                "@id": "https://oeg.fi.upm.es/"
+                "@id": "mailto:dgarijo@upm.es"
             }
         ]
     },
@@ -196,40 +209,27 @@
         ]
     },
     {
-        "@id": "https://doi.org/10.25504/FAIRsharing.9ca8a1",
+        "@id": "https://w3id.org/rsfc/repository",
         "http://purl.org/dc/terms/description": [
             {
                 "@language": "en",
-                "@value": "Software is associated with detailed provenance."
-            }
-        ],
-        "http://vivoweb.org/ontology/core#abbreviation": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.2"
+                "@value": "Main repository for Research Software Quality Checks (RSFC) code and documentation"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://xmlns.com/foaf/0.1/homePage": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "R1.2"
+                "@id": "https://github.com/oeg-upm/rsfc"
             }
         ]
     },
     {
-        "@id": "https://orcid.org/0000-0003-0454-7145",
+        "@id": "https://w3id.org/everse/i/indicators/software_is_containerized",
         "@type": [
-            "http://www.w3.org/2006/vcard/ns#Individual"
-        ],
-        "http://www.w3.org/2006/vcard/ns#fn": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#string",
-                "@value": "Daniel Garijo"
-            }
+            "http://www.w3.org/ns/dqv#Metric"
         ],
-        "http://www.w3.org/2006/vcard/ns#hasEmail": [
+        "http://www.w3.org/2002/07/owl#sameAs": [
             {
-                "@id": "mailto:dgarijo@upm.es"
+                "@id": "https://fairsharing.org/8338"
             }
         ]
     }
diff --git a/doc/test/RSFC-06-4/RSFC-06-4.ttl b/doc/test/RSFC-22-1/RSFC-22-1.ttl
similarity index 68%
rename from doc/test/RSFC-06-4/RSFC-06-4.ttl
rename to doc/test/RSFC-22-1/RSFC-22-1.ttl
index 4e89334..82ff92e 100644
--- a/doc/test/RSFC-06-4/RSFC-06-4.ttl
+++ b/doc/test/RSFC-22-1/RSFC-22-1.ttl
@@ -12,27 +12,28 @@
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 
 
-<https://w3id.org/rsfc/test/RSFC-06-4> a ftr:Test, dcat:DataService ;
+<https://w3id.org/rsfc/test/RSFC-22-1> a ftr:Test, dcat:DataService ;
     dcat:contactPoint <https://orcid.org/0000-0003-0454-7145> ;
     dcterms:creator <https://orcid.org/0000-0003-0454-7145> ,
                     <https://github.com/andriumon> ;
-    dcterms:title "Authors have roles"@en ;
-    rdfs:label "RSFC-06-4"^^xsd:string ;
-    vivo:abbreviation "RSFC-06-4"^^xsd:string ;
+    dcterms:title "Software is containerized"@en ;
+    rdfs:label "RSFC-22-1"^^xsd:string ;
+    vivo:abbreviation "RSFC-22-1"^^xsd:string ;
     dcterms:license <http://creativecommons.org/licenses/by/4.0/> ;
-    dcterms:description """This test checks if authors have their roles stated in a codemeta.json. This is achieved by looking for authors in the codemeta.json file and checking if all of them have a role assigned. This process follows the codemeta v2 and v3 standards."""@en ;
+    dcterms:description """This test checks if there is a container file in the repository. This is done by checking if there is any container build type file (i.e Dockerfile, Podman, Apptainer)  in the repository’s root."""@en ;
     dcterms:publisher <https://oeg.fi.upm.es> ,
                       <https://ror.org/03n6nwv02> ;
-    dqv:inDimension  <https://doi.org/10.25504/FAIRsharing.a712f1>, <https://doi.org/10.25504/FAIRsharing.60a40f>;
     dcat:version "0.0.1"^^xsd:string ;
-    dcterms:identifier "https://w3id.org/rsfc/test/RSFC-06-4" ;
-    dcat:keyword "Author"@en , "Rol"@en , 
+    dcterms:identifier "https://w3id.org/rsfc/test/RSFC-22-1" ;
+	dqv:inDimension  <https://doi.org/10.25504/FAIRsharing.60a40f>;
+    dcat:keyword "Containerized"@en , "Repository"@en , 
                  "Test"@en ;
     dcat:endpointDescription <https://w3id.org/rsfc/api> ;
-    dcat:endpointURL <https://api.rsfc.linkeddata.es/assess/test/RSFC-06-4> ;
+    dcat:endpointURL <https://api.rsfc.linkeddata.es/assess/test/RSFC-22-1> ;
     dpv:isApplicableFor <https://schema.org/SoftwareSourceCode> ;
     ftr:supportedBy <https://w3id.org/rsfc/> ;
-    <http://semanticscience.org/resource/SIO_000233> <https://w3id.org/everse/i/indicators/software_documentation> ; 
+    ftr:supportedBy <https://w3id.org/rsfc/> ;
+    <http://semanticscience.org/resource/SIO_000233> <https://w3id.org/everse/i/indicators/software_is_containerized> ; 
     doap:repository <https://w3id.org/rsfc/repository> .
 <https://orcid.org/0000-0003-0454-7145> a vcard:Individual ;
     vcard:fn "Daniel Garijo"^^xsd:string ;
@@ -40,14 +41,10 @@
 <https://github.com/andriumon> a vcard:Individual ;
     vcard:fn "Andres Montero"^^xsd:string ;
     vcard:hasEmail <mailto:andres.montero.martin@upm.es> .
-<https://doi.org/10.25504/FAIRsharing.a712f1> 
-	rdfs:label "F2"^^xsd:string ;
-	vivo:abbreviation "F2"^^xsd:string ;
-	dcterms:description "Software is described with rich metadata."@en .
 <https://doi.org/10.25504/FAIRsharing.60a40f> 
 	rdfs:label "R3"^^xsd:string ;
 	vivo:abbreviation "R3"^^xsd:string ;
-	dcterms:description "Software meets domain-relevant community standards."@en .
+	dcterms:description "Software meets domain-relevant community standards"@en .
 <https://oeg.fi.upm.es> a vcard:Organization ;
     rdfs:label "Ontology Engineering Group" ;
     vcard:url <https://oeg.fi.upm.es/> .
@@ -58,5 +55,6 @@
 <https://w3id.org/rsfc/repository>
     foaf:homePage <https://github.com/oeg-upm/rsfc> ;
     dcterms:description "Main repository for Research Software Quality Checks (RSFC) code and documentation"@en .
-<https://w3id.org/everse/i/indicators/software_documentation> a dqv:Metric ;
-    owl:sameAs <https://doi.org/10.25504/FAIRsharing.452bcd> .
\ No newline at end of file
+<https://w3id.org/everse/i/indicators/software_is_containerized> a dqv:Metric ;
+    owl:sameAs <https://fairsharing.org/8338> .
+ 
\ No newline at end of file