diff --git a/test-cases/RMLFNMLTC0001-CSV/README.md b/test-cases/RMLFNMLTC0001-CSV/README.md
deleted file mode 100644
index 625a34d..0000000
--- a/test-cases/RMLFNMLTC0001-CSV/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-## RMLFNMLTC0001-CSV
-
-**Title**: Function on object, 0 parameters
-
-**Description**: Tests
-(1) if a function without parameters can be used (FnO)
-(2) if a function on an object map can be used (Term)
-(3) if the output of the function is assigned the correct termType by default
-
-**Error expected?** No
-
-**Input**
-```
-Id,Name,Comment,Class
-1,Venus,A&B,A
-
-```
-
-**Mapping**
-```
-@prefix foaf: .
-@prefix ex: .
-@prefix xsd: .
-@prefix rml: .
-@prefix fno: .
-@prefix idlab-fn: .
-
-@base .
-
-
- rml:logicalSource [
- rml:source [ a rml:RelativePathSource;
- rml:root rml:MappingDirectory;
- rml:path "student.csv"
- ];
- rml:referenceFormulation rml:CSV
- ];
- rml:subjectMap [
- rml:template "http://example.com/{Name}"
- ];
- rml:predicateObjectMap [
- rml:predicate foaf:name;
- rml:objectMap [
- rml:functionExecution <#Execution> ;
- rml:return idlab-fn:_stringOut
- ]
- ] .
-
-<#Execution>
- rml:function idlab-fn:random .
-
-```
-
-**Output**
-```
- "e4dcc7ee-8e2a-4012-92cc-9a74dd545e89" .
-
-```
-
diff --git a/test-cases/RMLFNMLTC0001-CSV/mapping.ttl b/test-cases/RMLFNMLTC0001-CSV/mapping.ttl
deleted file mode 100644
index ff9e9cc..0000000
--- a/test-cases/RMLFNMLTC0001-CSV/mapping.ttl
+++ /dev/null
@@ -1,30 +0,0 @@
-@prefix foaf: .
-@prefix ex: .
-@prefix xsd: .
-@prefix rml: .
-@prefix fno: .
-@prefix idlab-fn: .
-
-@base .
-
-
- rml:logicalSource [
- rml:source [ a rml:RelativePathSource;
- rml:root rml:MappingDirectory;
- rml:path "student.csv"
- ];
- rml:referenceFormulation rml:CSV
- ];
- rml:subjectMap [
- rml:template "http://example.com/{Name}"
- ];
- rml:predicateObjectMap [
- rml:predicate foaf:name;
- rml:objectMap [
- rml:functionExecution <#Execution> ;
- rml:return idlab-fn:_stringOut
- ]
- ] .
-
-<#Execution>
- rml:function idlab-fn:random .
diff --git a/test-cases/RMLFNMLTC0001-CSV/output.nq b/test-cases/RMLFNMLTC0001-CSV/output.nq
deleted file mode 100644
index a76f685..0000000
--- a/test-cases/RMLFNMLTC0001-CSV/output.nq
+++ /dev/null
@@ -1 +0,0 @@
- "e4dcc7ee-8e2a-4012-92cc-9a74dd545e89" .
diff --git a/test-cases/RMLFNMLTC0001-CSV/student.csv b/test-cases/RMLFNMLTC0001-CSV/student.csv
deleted file mode 100644
index cb323e9..0000000
--- a/test-cases/RMLFNMLTC0001-CSV/student.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Id,Name,Comment,Class
-1,Venus,A&B,A
diff --git a/test-cases/RMLFNMLTC0102-CSV/README.md b/test-cases/RMLFNMLTC0102-CSV/README.md
index f9c01cc..7dd70ff 100644
--- a/test-cases/RMLFNMLTC0102-CSV/README.md
+++ b/test-cases/RMLFNMLTC0102-CSV/README.md
@@ -4,7 +4,7 @@
**Description**: Tests that nothing is generated if a function is used where no implementation is made available to the mapping engine
-**Error expected?** No
+**Error expected?** Yes
**Input**
```
@@ -55,8 +55,3 @@ Id,Name,Comment,Class
```
-**Output**
-```
-
-```
-
diff --git a/test-cases/RMLFNMLTC0102-CSV/output.nq b/test-cases/RMLFNMLTC0102-CSV/output.nq
deleted file mode 100644
index e69de29..0000000
diff --git a/test-cases/RMLFNMLTC0103-CSV/README.md b/test-cases/RMLFNMLTC0103-CSV/README.md
index bfe7dd0..2d53da6 100644
--- a/test-cases/RMLFNMLTC0103-CSV/README.md
+++ b/test-cases/RMLFNMLTC0103-CSV/README.md
@@ -4,7 +4,7 @@
**Description**: Tests that nothing is generated if a function is defined using a parameter not defined in the FnO description
-**Error expected?** No
+**Error expected?** Yes
**Input**
```
@@ -55,8 +55,3 @@ Id,Name,Comment,Class,url
```
-**Output**
-```
-
-```
-
diff --git a/test-cases/RMLFNMLTC0103-CSV/output.nq b/test-cases/RMLFNMLTC0103-CSV/output.nq
deleted file mode 100644
index e69de29..0000000
diff --git a/test-cases/RMLFNMLTC0104-CSV/README.md b/test-cases/RMLFNMLTC0104-CSV/README.md
index 8a02a34..c187f9d 100644
--- a/test-cases/RMLFNMLTC0104-CSV/README.md
+++ b/test-cases/RMLFNMLTC0104-CSV/README.md
@@ -4,7 +4,7 @@
**Description**: Tests that nothing is generated if a function is defined using a return not defined in the FnO description
-**Error expected?** No
+**Error expected?** Yes
**Input**
```
@@ -55,8 +55,3 @@ Id,Name,Comment,Class,url
```
-**Output**
-```
-
-```
-
diff --git a/test-cases/RMLFNMLTC0104-CSV/output.nq b/test-cases/RMLFNMLTC0104-CSV/output.nq
deleted file mode 100644
index e69de29..0000000
diff --git a/test-cases/descriptions.csv b/test-cases/descriptions.csv
index a191582..a6be6cd 100644
--- a/test-cases/descriptions.csv
+++ b/test-cases/descriptions.csv
@@ -1,10 +1,6 @@
ID,title,description,part of spec,data format,ref. formulation,error expected?,input file 1,input file 2,input file 3,comment
-RMLFNMLTC0001-CSV,"Function on object, 0 parameters","Tests
-(1) if a function without parameters can be used (FnO)
-(2) if a function on an object map can be used (Term)
-(3) if the output of the function is assigned the correct termType by default",,CSV,CSV,FALSE,student.csv,,,
-RMLFNMLTC0002-CSV,"Function on object, 1 reference parameter","Tests:
-(1) if a function with one parameter can be used, (FnO)
+RMLFNMLTC0002-CSV,"Function on object, 1 reference parameter","Tests:
+(1) if a function with one parameter can be used, (FnO)
(2) a reference parameter can be used (Term)",,CSV,CSV,FALSE,student.csv,,,
RMLFNMLTC0003-CSV,"Function on object, 1 reference parameter, the output termType is IRI",Tests if the output of the function is assigned the correct termType,,CSV,CSV,FALSE,student.csv,,,
RMLFNMLTC0004-CSV,"Function on object, the output termType is Literal",Tests if the output of the function is assigned the correct termType,,CSV,CSV,FALSE,student.csv,,,
@@ -13,8 +9,8 @@ RMLFNMLTC0007-CSV,Function on object returns empty string,Tests that a triple is
RMLFNMLTC0008-CSV,Function on object returns null,Tests that no triple should be generated when the result is null.,,CSV,CSV,FALSE,student.csv,,,
RMLFNMLTC0011-CSV,"Function on predicate, 1 parameter",Tests if a function can be used on a predicate,,CSV,CSV,FALSE,student.csv,,,
RMLFNMLTC0021-CSV,"Function on object, 1 reference parameter, 1 constant parameter",Tests if a function with multiple parameters can be used,,CSV,CSV,FALSE,student.csv,,,
-RMLFNMLTC0031-CSV,"Function on subject, 1 parameter","Tests if
-(1) a function can be used on a subject
+RMLFNMLTC0031-CSV,"Function on subject, 1 parameter","Tests if
+(1) a function can be used on a subject
(2) Tests if the default termType assigned to the output of the function to be correct",,CSV,CSV,FALSE,student.csv,,,
RMLFNMLTC0032-CSV,Condition on subject,Tests that a condition shortcut works,,,,,,,,
RMLFNMLTC0041-CSV,Function using non-constant shortcut property return,Tests that a non-constant FNML Return map also works,,CSV,CSV,FALSE,student.csv,,,"does this can be tested with SHACL? If yes, I think this wouldn't be a test-case"
diff --git a/test-cases/metadata.csv b/test-cases/metadata.csv
index c26f1b8..1f79753 100644
--- a/test-cases/metadata.csv
+++ b/test-cases/metadata.csv
@@ -1,28 +1,24 @@
ID,title,description,specification,mapping,input_format1,input_format2,input_format3,output_format1,output_format2,output_format3,input1,input2,input3,output1,output2,output3,error
-RMLFNMLTC0001-CSV,"Function on object, 0 parameters","Tests
-(1) if a function without parameters can be used (FnO)
-(2) if a function on an object map can be used (Term)
-(3) if the output of the function is assigned the correct termType by default",http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0104-CSV,"Function on object, wrong return parameter",Tests that nothing is generated if a function is defined using a return not defined in the FnO description,fnml,mapping.ttl,text/csv,,,,,,student.csv,,,,,,true
+RMLFNMLTC0003-CSV,"Function on object, 1 reference parameter, the output termType is IRI",Tests if the output of the function is assigned the correct termType,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0102-CSV,"Function on object, wrong function URI",Tests that nothing is generated if a function is used where no implementation is made available to the mapping engine,fnml,mapping.ttl,text/csv,,,,,,student.csv,,,,,,true
+RMLFNMLTC0101-CSV,"Function on object, 1 false reference parameter",Tests if a false reference parameters is caught,fnml,mapping.ttl,text/csv,,,,,,student.csv,,,,,,true
+RMLFNMLTC0007-CSV,Function on object returns empty string,Tests that a triple is generated when the results is an empty string.,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0103-CSV,"Function on object, wrong parameter",Tests that nothing is generated if a function is defined using a parameter not defined in the FnO description,fnml,mapping.ttl,text/csv,,,,,,student.csv,,,,,,true
+RMLFNMLTC0051-CSV,Nested function - Test A,"Tests if a composite function of form f(g(x1),x2) works (i.e., the inner function is only one argument of the outer function)",fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0021-CSV,"Function on object, 1 reference parameter, 1 constant parameter",Tests if a function with multiple parameters can be used,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0081-CSV,"Function on languageMap, 1 parameter",Tests that function on LanguageMap is handled,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0061-CSV,"Function on graph, 1 parameter",Tests if a function can be used on a graph,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0011-CSV,"Function on predicate, 1 parameter",Tests if a function can be used on a predicate,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0032-CSV,Condition on subject,Tests that a condition shortcut works,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0005-CSV,"Function on object, 1 template parameter",Tests if a function with a template parameter can be used,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0071-CSV,"Function on datatypeMap, 1 parameter",Tests that function on DatatypeMap is handled,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
RMLFNMLTC0002-CSV,"Function on object, 1 reference parameter","Tests:
(1) if a function with one parameter can be used, (FnO)
-(2) a reference parameter can be used (Term)",http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0003-CSV,"Function on object, 1 reference parameter, the output termType is IRI",Tests if the output of the function is assigned the correct termType,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0004-CSV,"Function on object, the output termType is Literal",Tests if the output of the function is assigned the correct termType,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0005-CSV,"Function on object, 1 template parameter",Tests if a function with a template parameter can be used,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0007-CSV,Function on object returns empty string,Tests that a triple is generated when the results is an empty string.,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0008-CSV,Function on object returns null,Tests that no triple should be generated when the result is null.,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0011-CSV,"Function on predicate, 1 parameter",Tests if a function can be used on a predicate,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0021-CSV,"Function on object, 1 reference parameter, 1 constant parameter",Tests if a function with multiple parameters can be used,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+(2) a reference parameter can be used (Term)",fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0004-CSV,"Function on object, the output termType is Literal",Tests if the output of the function is assigned the correct termType,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0008-CSV,Function on object returns null,Tests that no triple should be generated when the result is null.,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+RMLFNMLTC0041-CSV,Function using non-constant shortcut property return,Tests that a non-constant FNML Return map also works,fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
RMLFNMLTC0031-CSV,"Function on subject, 1 parameter","Tests if
(1) a function can be used on a subject
-(2) Tests if the default termType assigned to the output of the function to be correct",http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0032-CSV,Condition on subject,Tests that a condition shortcut works,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0041-CSV,Function using non-constant shortcut property return,Tests that a non-constant FNML Return map also works,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0051-CSV,Nested function - Test A,"Tests if a composite function of form f(g(x1),x2) works (i.e., the inner function is only one argument of the outer function)",http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0061-CSV,"Function on graph, 1 parameter",Tests if a function can be used on a graph,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0071-CSV,"Function on datatypeMap, 1 parameter",Tests that function on DatatypeMap is handled,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0081-CSV,"Function on languageMap, 1 parameter",Tests that function on LanguageMap is handled,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0101-CSV,"Function on object, 1 false reference parameter",Tests if a false reference parameters is caught,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,,,,student.csv,,,,,,true
-RMLFNMLTC0102-CSV,"Function on object, wrong function URI",Tests that nothing is generated if a function is used where no implementation is made available to the mapping engine,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0103-CSV,"Function on object, wrong parameter",Tests that nothing is generated if a function is defined using a parameter not defined in the FnO description,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
-RMLFNMLTC0104-CSV,"Function on object, wrong return parameter",Tests that nothing is generated if a function is defined using a return not defined in the FnO description,http://w3id.org/rml/fnml/,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false
+(2) Tests if the default termType assigned to the output of the function to be correct",fnml,mapping.ttl,text/csv,,,application/n-quads,,,student.csv,,,output.nq,,,false