diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bae6359..f07556b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,22 +42,13 @@ cache:
   script:
     - 'mvn $MAVEN_CLI_OPTS test'
 
-# Build merge requests using JDK8
-build:jdk8:
-  <<: *build
-  image: maven:3-jdk-8
-
-# Test merge requests using JDK8
-test:jdk8:
-  <<: *test
-  image: maven:3-jdk-8
 
 # Build merge requests using JDK12
-build:jdk12:
+build:jdk11:
   <<: *build
-  image: maven:3-jdk-12
+  image: maven:3-jdk-11
 
 # Test merge requests using JDK12
-test:jdk12:
+test:jdk11:
   <<: *test
-  image: maven:3-jdk-12
+  image: maven:3-jdk-11
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c968b923..09c8a16d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,30 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
-
-* Function mapping.
+                       
+* Support for stream partitioning in windows
 * Joins of data streams
 
+## [2.1.0] - 2020-03-18
+
+### Added
+* Support for functions on a per-record basis using the [Function Ontology](https://fno.io/).
+
+### Changed
+* Updated Flink from version 1.10.0 to 1.11.3
+* Updated Kafka from version 2.2.2 to 2.4.1 (more versions supported using the universal connector)
+* Updated VTD-XML from version 2.11 to 2.13.4
+
+### Removed
+* Drop support for Java 8, only Java 11 supported.
+* TCP PUSH support disabled: this code relies on development version of Apache Bahir.
+
+### Fixed
+* Cyclic reference of parent triples maps leads to a stack overflow error (GitHub [issue #19](https://github.com/RMLio/RMLStreamer/issues/19), Internal [issue #108](https://gitlab.ilabt.imec.be/rml/proc/rml-streamer/-/issues/108))
+* In some cases not all triples maps were applied when joins (static-static and static-streams) are involved (fixed together with issue above).
+* Writing to file when input streams are involved is now possible (See GitHub [issue #8](https://github.com/RMLio/RMLStreamer/issues/8), internal [issue #107](https://gitlab.ilabt.imec.be/rml/proc/rml-streamer/-/issues/107)).
+* XML/XPath handling was erroneous (See GitHub [issue #24](https://github.com/RMLio/RMLStreamer/issues/24), internal [issue #124](https://github.com/RMLio/RMLStreamer/issues/24)).
+
 ## [2.0.0] - 2020-06-08
 
 ### Changed
@@ -102,4 +122,5 @@ can be set with the program argument `--baseIRI`.
 [1.2.1]: https://github.com/RMLio/RMLStreamer/compare/v1.2.0...v1.2.1
 [1.2.2]: https://github.com/RMLio/RMLStreamer/compare/v1.2.1...v1.2.2  
 [1.2.3]: https://github.com/RMLio/RMLStreamer/compare/v1.2.2...v1.2.3
-[2.0.0]: https://github.com/RMLio/RMLStreamer/compare/v1.2.3...v2.0.0  
\ No newline at end of file
+[2.0.0]: https://github.com/RMLio/RMLStreamer/compare/v1.2.3...v2.0.0  
+[2.1.0]: https://github.com/RMLio/RMLStreamer/compare/v2.0.0...v2.1.0  
diff --git a/README.md b/README.md
index aa6842f4..2f7cde90 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@ The RMLStreamer generates [RDF](https://www.w3.org/2001/sw/wiki/RDF) from files
 using [RML](http://rml.io/). The difference with other RML implementations is that it can handle
 *big* input files and *continuous data streams*, like sensor data.
 
+Documentation regarding the use of (custom) functions can be found [here](documentation/README_Functions.md).
+
 ### Quick start
 
 If you want to get the RMLStreamer up and running within 5 minutes using Docker, check out [docker/README.md](docker/README.md)
@@ -13,15 +15,15 @@ If you want to deploy it yourself, read on.
 
 ### Installing Flink
 RMLStreamer runs its jobs on Flink clusters.
-More information on how to install Flink and getting started can be found [here](https://ci.apache.org/projects/flink/flink-docs-release-1.10/getting-started/tutorials/local_setup.html).
+More information on how to install Flink and getting started can be found [here](https://ci.apache.org/projects/flink/flink-docs-release-1.11/try-flink/local_installation.html).
 At least a local cluster must be running in order to start executing RML Mappings with RMLStreamer.
-Please note that this version works with Flink 1.10.0 with Scala 2.11 support, which can be downloaded [here](https://www.apache.org/dyn/closer.lua/flink/flink-1.10.0/).
+Please note that this version works with Flink 1.11.3 with Scala 2.11 support, which can be downloaded [here](https://archive.apache.org/dist/flink/flink-1.11.3/flink-1.11.3-bin-scala_2.11.tgz).
 
 ### Building RMLStreamer
 
 In order to build a jar file that can be deployed on a Flink cluster, you need:
-- a Java JDK 8 or higher
-- Apache Maven 3 or higher 
+- a Java JDK >= 11 and <= 13 (We develop and test on JDK 11)
+- Apache Maven 3 or higher
 
 Clone or download and then build the code in this repository:
 
@@ -44,7 +46,7 @@ The resulting `RMLStreamer-<version>.jar`, found in the `target` folder, can be
 ### Executing RML Mappings
 
 Here we give examples for running RMLStreamer from the command line. We use `FLINK_BIN` to denote the Flink CLI tool,
-usually found in the `bin` directory of the Flink installation. E.g. `/home/myuser/flink-1.10.0/bin/flink`.
+usually found in the `bin` directory of the Flink installation. E.g. `/home/myuser/flink-1.11.3/bin/flink`.
 For Windows a `flink.bat` script is provided.
 
 The general usage is:
@@ -74,7 +76,7 @@ $FLINK_BIN run <path to RMLStreamer jar> toKafka --broker-list <host:port> --top
 #### Complete RMLStreamer usage:
 
 ```
-Usage: RMLStreamer [toFile|toKafka|toTCPSocket] [options]
+Usage: RMLStreamer [toFile|toKafka|toTCPSocket|noOutput] [options]
 
   -j, --job-name <job name>
                            The name to assign to the job on the Flink cluster. Put some semantics in here ;)
@@ -85,13 +87,14 @@ Usage: RMLStreamer [toFile|toKafka|toTCPSocket] [options]
   -m, --mapping-file <RML mapping file>
                            REQUIRED. The path to an RML mapping file. The path must be accessible on the Flink cluster.
   --json-ld                Write the output as JSON-LD instead of N-Quads. An object contains all RDF generated from one input record. Note: this is slower than using the default N-Quads format.
-  --bulk                   Write all triples generated from one input record at once.
+  --bulk                   Write all triples generated from one input record at once, instead of writing triples the moment they are generated.
   --checkpoint-interval <time (ms)>
-                           If given, Flink's checkpointing is enabled with the given interval. If not given, checkpointing is disabled.
+                           If given, Flink's checkpointing is enabled with the given interval. If not given, checkpointing is enabled when writing to a file (this is required to use the flink StreamingFileSink). Otherwise, checkpointing is disabled.
 Command: toFile [options]
-Write output to file
+Write output to file 
+Note: when the mapping consists only of stream triple maps, a StreamingFileSink is used. This sink will write the output to a part file at every checkpoint.
   -o, --output-path <output file>
-                           The path to an output file.
+                           The path to an output file. Note: when a StreamingFileSink is used (the mapping consists only of stream triple maps), this path specifies a directory and optionally an extension. Part files will be written to the given directory and the given extension will be used for each part file.
 Command: toKafka [options]
 Write output to a Kafka topic
   -b, --broker-list <host:port>[,<host:port>]...
@@ -118,7 +121,6 @@ An example of how to define the generation of an RDF stream from a stream in an
         rml:source [
             rdf:type rmls:TCPSocketStream ;
             rmls:hostName "localhost";
-            rmls:type "PULL" ;
             rmls:port "5005"
         ];
         rml:referenceFormulation ql:JSONPath;
@@ -168,7 +170,7 @@ An example of how to define the generation of an RDF stream from a stream in an
     rml:logicalSource [
         rml:source [
             rdf:type rmls:KafkaStream ;
-            rmls:broker "broker" ;
+            rmls:broker "localhost:9092" ;
             rmls:groupId "groupId";
             rmls:topic "topic";
         ];
@@ -190,38 +192,6 @@ See also https://stackoverflow.com/questions/38639019/flink-kafka-consumer-group
 
 The only option for spreading load is to use multiple topics, and assign one RMLStreamer job to one topic.
 
-##### Generating a stream from a file (to be implemented)
-```
-<#TripleMap>
-
-    a rr:TriplesMap;
-    rml:logicalSource [
-        rml:source [
-            rdf:type rmls:FileStream;
-            rmls:path "/home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/books.json"
-        ];
-        rml:referenceFormulation ql:JSONPath;
-        rml:iterator "$.store.books[*]"
-    ];
-
-    rr:subjectMap [
-        rr:template "{$.id}" ;
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "$.id";
-                rr:termType rr:Literal
-            ]
-        ].
-```
-
 ##### Generating a stream from a dataset
 
 ```
@@ -269,17 +239,6 @@ The following are the classes/terms currently used:
 
 
 * **rmls:port** specifies a port number for the stream mapper to connect to. 
-
-
-* **rmls:type** specifies how a streamer will act: 
-    * **"PULL"**:  
-      The stream mapper will act as a client.  
-      It will create a socket and connect to the specified port at the given host name.  
-      **rmls:port** and **rmls:hostName** needs to be specified.  
-    * **"PUSH"**:  
-      The stream mapper will act as a server and will start listening at the given port.  
-      If the given port is taken, the mapper will keep opening subsequent ports until a free port is found.    
-      Only **rmls:port** needs to be specified here.  
     
 Example of a valid json logical source map using all possible terms: 
 
@@ -289,7 +248,6 @@ rml:logicalSource [
         rml:source [
             rdf:type rmls:TCPSocketStream ;
             rmls:hostName "localhost";
-            rmls:type "PULL" ;
             rmls:port "5005"
         ];
         rml:referenceFormulation ql:JSONPath;
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 021210b1..fb61a26c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
 
   jobmanager:
-    image: flink:1.10.0-scala_2.11
+    image: flink:1.11.3-scala_2.11
     expose:
       - "6123"
     ports:
@@ -14,7 +14,7 @@ services:
       - data:/mnt/data
 
   taskmanager:
-    image: flink:1.10.0-scala_2.11
+    image: flink:1.11.3-scala_2.11
     expose:
       - "6121"
       - "6122"
diff --git a/documentation/README_DEVELOPMENT.md b/documentation/README_DEVELOPMENT.md
new file mode 100644
index 00000000..75b5069e
--- /dev/null
+++ b/documentation/README_DEVELOPMENT.md
@@ -0,0 +1,18 @@
+# Setting up RMLStreamer for development
+
+## Prerequisites
+* Git
+* Java JDK 11
+* Maven 3
+* IntelliJ (Eclipse should work too, but consult Flink documentation for set-up)
+
+## Setting up the environment (IntelliJ)
+* Make sure you have the scala plugin installed and enabled in IntelliJ.
+* Clone the repository.
+* Open IntelliJ.
+* Open `pom.xml` as a project.
+* IntelliJ probably asks to automatically download the dependencies; this is generally a good idea.
+* There should be a `Maven` tool window tab somewhere; open it. If not, you can open it via the menu: `View` > `Tool Windows` > `Maven`.
+* Enable the profile `add-dependencies-for-IDEA`.
+
+![Maven profile selection](images/maven_intellij.png)
diff --git a/documentation/README_Functions.md b/documentation/README_Functions.md
new file mode 100644
index 00000000..d53ac3bf
--- /dev/null
+++ b/documentation/README_Functions.md
@@ -0,0 +1,191 @@
+# README: Functions
+
+
+When deploying and running jobs on Flink, make sure
+- to either place the external jars (e.g. `IDLabFunctions.jar` and `GrelFunctions.jar`) in Flink's `lib` directory,
+or package the RMLStreamer along with those jars by placing them in `src/main/resources`.  
+- to place the following files in the directory where the `flink run ...` command is issued.
+These files can be obtained from `src/main/resources`:
+    - `functions_grel.ttl`
+    - `functions_grel.ttl`
+    - `grel_java_mapping.ttl`
+    - `idlab_java_mapping.ttl`
+---
+
+## Example: RML Streamer + Flink    
+Flink's `lib` directory should contain the jar-files with the custom functions. In this example, these are marked with `*`
+```
+flink-1.11.2-scala_2.11
+    └── lib
+        ├── GrelFunctions.jar                       *
+        ├── IDLabFunctions.jar                      *
+        ├── flink-dist_2.11-1.11.2.jar
+        ├── flink-table-blink_2.11-1.11.2.jar
+        ├── flink-table_2.11-1.11.2.jar
+        ├── log4j-1.2.17.jar
+        └── slf4j-log4j12-1.7.15.jar
+``` 
+When running the RML Streamer on Flink, the directory should look like
+```
+.
+├── RMLStreamer-2.0.1-SNAPSHOT.jar
+├── functions_grel.ttl
+├── functions_idlab.ttl
+├── grel_java_mapping.ttl
+├── idlab_java_mapping.ttl
+├── mapping.ttl
+└── input_data.csv
+```
+Note that the function descriptions and function mappings are present.
+
+The command for running the RML Streamer on Flink should look like
+```
+~/flink/flink-1.11.2-scala_2.11/bin/flink run -c io.rml.framework.Main RMLStreamer-2.0.1-SNAPSHOT.jar toFile --output-path $(pwd)'/out.ttl' -m mapping.ttl
+```       
+       
+## Test Cases
+### FnO Tests
+The official FnO testcases that are working can be found at `test/resources/fno-testcases`. 
+
+### SandboxTests
+> These tests are still experimental.
+
+The resources can be found at `test/resources/sandbox/function_related` and are executed from `io.rml.framework.SandboxTests`.
+Every test output is compared to the RMLMapper's output (e.g. `output.ttl`) for that test. A test passes when its output is equal to the RMLMapper's output.
+Tests marked as `pending` should be considered as not working.<br>
+
+The sandbox testcases are
+- `condition-function-on-po`: uses the functions
+    - `idlab-fn:trueCondition`
+    - `idlab-fn:stringContainsOtherString` 
+    - `grel:toUpperCase`
+  
+- `condition-on-mapping-subject-function`: uses the functions
+    - `idlab-fn:trueCondition`
+    - `idlab-fn:notEqual` 
+
+- `condition-on-po`: uses the functions
+    - `idlab-fn:trueCondition`
+    - `idlab-fn:equal` 
+    
+
+- `contains` uses function  `grel:string_contains`
+
+- `controls_if_contains`: uses the functions
+    - `grel:controls_if`
+    - `grel:string_contains`
+
+- `controls_if_true`: uses the functions `grel:controls_if`. 
+    
+- `controls_if_false`: uses the functions `grel:controls_if`
+    
+- `equal`: uses function `idlab-fn:equal`
+
+- `notEqual`: uses function `idlab-fn:notEqual`
+
+- `using_trueCondition_and_contains`
+    - `idlab-fn:trueCondition`
+    - `grel:string_contains` 
+    
+- `using_trueCondition_and_equal`
+    - `idlab-fn:trueCondition`
+    - `idlab-fn:equal` 
+
+
+
+
+## Tutorial: Using a function from a local JAR
+
+The following FnO-testcases use the function `toUpperCaseURL` 
+- RMLFNOTC0004-CSV
+- RMLFNOTC0005-CSV
+- RMLFNOTC0006-CSV
+
+The following steps show how to integrate the `toUpperCaseURL` function in the RML Streamer.
+
+### Step 1: creating the JAR
+This step is based on the best-practice example [`grel-functions-java`](https://github.com/FnOio/grel-functions-java).
+- Create package  `io.fno.idlab` and within that package, create the class `IDLabFunctions`
+- For these testcases, we need a function that returns the given URL in uppercase. 
+- Make sure to set the Maven compiler to a version compatible with the RMLStreamer's version.
+
+The following listing serves a minimalistic example that shows a possible implementation of the `toUpperCaseURL`-function.   
+```Java
+package io.fno.idlab;
+
+public class IDLabFunctions {
+    public static String toUpperCaseURL(String s) {
+        if(!s.startsWith("http"))
+            return "http://" + s.toUpperCase();
+        return s.toUpperCase();
+    }
+}
+```
+
+Use Maven to build a JAR-file, and move this JAR-file to the RMLStreamer’s `main/resources`.
+
+### Step 2: defining the FnO descriptions
+An FnO description represents the abstract definition of a function.<br> 
+The aforementioned testcases require a function that returns a valid URL in uppercase.
+ Its description is shown in the following listing, and can be found in `functions_idlab.ttl`.  
+
+```Turtle
+idlab-fn:toUpperCaseURL
+    a                   fno:Function ;
+    fno:name            "toUppercaseURL" ;
+    rdfs:label          "toUppercaseURL" ;
+    dcterms:description "Returns an uppercase, valid url." ;
+    fno:solves          grel:prob_ucase ;
+    fno:expects         ( idlab-fn:_str ) ;
+    fno:returns         ( idlab-fn:_stringOut ) .
+```
+
+### Step 3: map FnO descriptions to the corresponding implementations
+In the previous step, the abstract functions were created. 
+The current step will define the link between abstract function descriptions and the corresponding implementation.
+ This is illustrated by the following listing, extracted from `idlab_java_mapping.ttl`.
+```Turtle 
+grelm:IDLabFunctions
+    a                  fnoi:JavaClass ;
+    doap:download-page "IDLabFunctions.jar" ;
+    fnoi:class-name    "io.fno.idlab.IDLabFunctions" .
+
+
+grelm:uppercaseURLMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:toUpperCaseURL;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "toUpperCaseURL" ] ;
+.
+
+```
+This mapping instructs the RML Streamer to look for a method called `toUpperCaseURL` within the `io.fno.idlab.IDLabFunctions`-class of the `IDLabFunctions.jar`. Make sure the JAR-file is located in `main/resources`.
+
+## How the `FunctionLoader` works
+
+The function descriptions and mappings mentioned in the previous steps will be used by the `FunctionLoader`.
+
+First, a `FunctionLoader` has to be aware of the available functions. 
+Therefore, it can be instantiated providing file paths to the function description files. 
+When no such file paths are provided, the default function descriptions are used (i.e. `functions_grel.ttl`). 
+
+Secondly, function URIs are mapped to the corresponding implementations by parsing the function mappings
+ (e.g. `resources/grel_java_mapping.ttl` and `resources/idlab_java_mapping.ttl`). 
+ During this step, every function URI is mapped to a `FunctionMetaData`-object which contains the necessary metadata  such as: the *download-page* of the library, the *class-name* of the function, the *method-name*, *input parameters* and *output parameters*.
+
+
+## How the `FunctionLoader` is used
+
+Initially, the `FunctionLoader` is used to read and parse function descriptions and mappings. 
+Afterwards, when running FNOT-testcases, the `FunctionLoader`-instance is used by `io.rml.framework.engine.statement.FunctionMapGeneratorAssembler` 
+to load and bind every function as specified in the testcase's `mapping.ttl`. 
+
+
+
+# Remarks
+- When the RMLStreamer is unable to find a function description or function mapping, bind method parameters to values, it will be logged as an error to the console
+  and the function will not be applied.
+ 
\ No newline at end of file
diff --git a/documentation/README_Netty_Snapshot.md b/documentation/README_Netty_Snapshot.md
new file mode 100644
index 00000000..ac371745
--- /dev/null
+++ b/documentation/README_Netty_Snapshot.md
@@ -0,0 +1,31 @@
+# README: Using JitPack
+(kept for reference only, not applicable anymore for RMLStreamer)
+
+### Using JitPack to get unpublished Maven Dependencies from a GitHub/GitLab repository
+
+If you want to use a Maven dependency that is not yet published on Maven Central or you want a specific version, [JitPack](https://jitpack.io/) can be used to get a specific snapshot from the GitHub/GitLab repository. Using JitPack is very simple, you simly go to the GitHub/GitLab repository and copy its link and paste on the JitPack site. Select the version and build system and get the config generated by JitPack. At the moment, this project uses JitPack for Bahir-Flink.
+
+### Step by step by step example
+
+In this example the maven dependency [Bahir-Flink](https://github.com/apache/bahir-flink) is built via JitPack.
+
+1. Copy the url of the repository you want to use.
+
+   ![Step 1: copy the repo link](img/copy_repo_link.png)
+
+2. Paste the repository url and look up the repo on JitPack.
+
+   ![Step 2: look up repo on JitPack](img/paste_repo_link.png)
+
+3. Select the build, commit, ... you need.
+
+   ![Step 3: get desired version](img/get_build.png)
+
+4. Copy the `pom.xml` patches and paste them in the `pom.xml` of your project.
+
+   ![Step 4: copy patches](img/copy_patch.png)
+
+When using a repository that contains different subprojets, you can also select one of those subprojets, instead of the entire project. In this example the `flink-netty-connector` subproject is selected from the Bahir-Flink repository.
+
+![Select a subproject](img/select_subproject.png)
+
diff --git a/documentation/images/maven_intellij.png b/documentation/images/maven_intellij.png
new file mode 100644
index 00000000..7a190134
Binary files /dev/null and b/documentation/images/maven_intellij.png differ
diff --git a/documentation/img/copy_patch.png b/documentation/img/copy_patch.png
new file mode 100644
index 00000000..d8a38794
Binary files /dev/null and b/documentation/img/copy_patch.png differ
diff --git a/documentation/img/copy_repo_link.png b/documentation/img/copy_repo_link.png
new file mode 100644
index 00000000..c9b3bd88
Binary files /dev/null and b/documentation/img/copy_repo_link.png differ
diff --git a/documentation/img/get_build.png b/documentation/img/get_build.png
new file mode 100644
index 00000000..82f96d6b
Binary files /dev/null and b/documentation/img/get_build.png differ
diff --git a/documentation/img/paste_repo_link.png b/documentation/img/paste_repo_link.png
new file mode 100644
index 00000000..9ddd2884
Binary files /dev/null and b/documentation/img/paste_repo_link.png differ
diff --git a/documentation/img/select_subproject.png b/documentation/img/select_subproject.png
new file mode 100644
index 00000000..8a7083c1
Binary files /dev/null and b/documentation/img/select_subproject.png differ
diff --git a/pom.xml b/pom.xml
index f75757b2..f224437e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ SOFTWARE.
 
     <groupId>io.rml</groupId>
     <artifactId>RMLStreamer</artifactId>
-    <version>2.0.0-RELEASE</version>
+    <version>2.1.0-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>RMLStreamer</name>
@@ -36,10 +36,11 @@ SOFTWARE.
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.10.0</flink.version>
+        <flink.version>1.11.3</flink.version>
         <slf4j.version>1.7.26</slf4j.version>
-        <log4j.version>2.13.1</log4j.version>
+        <log4j.version>2.13.3</log4j.version>
         <jena.version>3.11.0</jena.version>
+        <kafka.version>2.4.1</kafka.version>
 
         <scala.binary.version>2.11</scala.binary.version>
         <java.version>1.8</java.version>
@@ -51,29 +52,6 @@ SOFTWARE.
         <license.licenseName>mit</license.licenseName>
     </properties>
 
-    <!--
-
-        Execute "mvn clean package -Pbuild-jar"
-        to build a jar file out of this project!
-
-        How to use the Flink Quickstart pom:
-
-        a) Adding new dependencies:
-            You can add dependencies to the list below.
-            Please check if the maven-shade-plugin below is filtering out your dependency
-            and remove the exclude from there.
-
-        b) Build a jar for running on the cluster:
-            There are two options for creating a jar from this project
-
-            b.1) "mvn clean package" -> this will create a fat jar which contains all
-                    dependencies necessary for running the jar created by this pom in a cluster.
-                    The "maven-shade-plugin" excludes everything that is provided on a running Flink cluster.
-
-            b.2) "mvn clean package -Pbuild-jar" -> This will also create a fat-jar, but with much
-                    nicer dependency exclusion handling. This approach is preferred and leads to
-                    much cleaner jar files.
-    -->
 
     <dependencies>
 
@@ -112,31 +90,10 @@ SOFTWARE.
             <version>2.3.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.bahir</groupId>
-            <artifactId>flink-connector-netty_${scala.binary.version}</artifactId>
-            <version>1.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.flink</groupId>
-                    <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
-                    <groupId>org.apache.flink</groupId>
-                </exclusion>
-                <!-- provided by Flink -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
         <dependency>
             <groupId>com.ximpleware</groupId>
             <artifactId>vtd-xml</artifactId>
-            <version>2.11</version>
+            <version>2.13.4</version>
         </dependency>
 
         <dependency>
@@ -184,17 +141,11 @@ SOFTWARE.
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.java-websocket</groupId>
-            <artifactId>Java-WebSocket</artifactId>
-            <version>1.3.6</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.2</version>
+            <version>${log4j.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.scalatest/scalatest_2.10 -->
@@ -246,15 +197,17 @@ SOFTWARE.
             <version>${flink.version}</version>
         </dependency>
 
+
+
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_${scala.binary.version}</artifactId>
-            <version>2.2.2</version>
+            <version>${kafka.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <artifactId>log4j</artifactId>
-                    <groupId>log4j</groupId>
+                    <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
                 <!-- provided by Jena -->
                 <exclusion>
@@ -319,6 +272,12 @@ SOFTWARE.
                     <version>${flink.version}</version>
                     <scope>compile</scope>
                 </dependency>
+                <!-- Enables the Apache Flink Web UI DashBoard [https://stackoverflow.com/a/47000955/1728848] -->
+                <dependency>
+                    <groupId>org.apache.flink</groupId>
+                    <artifactId>flink-runtime-web_2.11</artifactId>
+                    <version>${flink.version}</version>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>
@@ -369,8 +328,8 @@ SOFTWARE.
                                 to use the transformer to include those files in the fat-jar.
                                 -->
                                 <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
+                                </transformer>
                                 <!--  This will add a Main-Class entry to the manifest file -->
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
diff --git a/src/main/resources/GrelFunctions.jar b/src/main/resources/GrelFunctions.jar
new file mode 100644
index 00000000..ef7c392b
Binary files /dev/null and b/src/main/resources/GrelFunctions.jar differ
diff --git a/src/main/resources/IDLabFunctions.jar b/src/main/resources/IDLabFunctions.jar
new file mode 100644
index 00000000..290ceb15
Binary files /dev/null and b/src/main/resources/IDLabFunctions.jar differ
diff --git a/src/main/resources/csv_data_mapping.ttl b/src/main/resources/csv_data_mapping.ttl
deleted file mode 100644
index 1ed1a719..00000000
--- a/src/main/resources/csv_data_mapping.ttl
+++ /dev/null
@@ -1,94 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-
-
-
-# LIJSTProducttype
-
- <#LogicalSource>
-    a rml:LogicalSource;
-    rml:source "/home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/airplane_data_headers.csv";
-    rml:referenceFormulation ql:CSV.
-
- <#LogicalSource_2>
-     a rml:LogicalSource;
-     rml:source "/home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/airplane_data_headers.csv";
-     rml:referenceFormulation ql:CSV.
-
- <#LIJSTProducttype_only_subject>
-
-     a rr:TriplesMap;
-     rml:logicalSource <#LogicalSource>;
-
-     rr:subjectMap [
-         rr:template "https://io.rml.airports/{Name}";
-         rr:termType rr:IRI;
-         rr:class skos:Concept
-     ].
-
-
- <#ParentTriplesMap>
-    a rr:TriplesMap;
-    rml:logicalSource <#LogicalSource_2>;
-    rr:subjectMap [
-        rr:template "https://io.rml.airports/parent/{Name}";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ].
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource <#LogicalSource>;
-
-    rr:subjectMap [
-        rml:reference "AirlineID";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "Name";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:parent;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rr:parentTriplesMap <#ParentTriplesMap>;
-                    rr:joinCondition [
-                        rr:parent "Name" ;
-                        rr:child "Name"
-                    ];
-                    rr:termType rr:IRI
-                ]
-            ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:city;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rml:reference "City";
-            rr:termType rr:Literal
-        ]
-    ].
diff --git a/src/main/resources/functions_grel.ttl b/src/main/resources/functions_grel.ttl
new file mode 100644
index 00000000..23dedb56
--- /dev/null
+++ b/src/main/resources/functions_grel.ttl
@@ -0,0 +1,1447 @@
+@prefix cc:      <http://creativecommons.org/ns#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix fno:     <https://w3id.org/function/ontology#> .
+@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
+@prefix grel:    <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix void:    <http://rdfs.org/ns/void#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+grel:void
+    a                 void:DatasetDescription ;
+    dcterms:title     "A VoID Description of the GREL Fno Descriptions Dataset" ;
+    dcterms:creator   <https://ben.de-meester.org/#me> ;
+    foaf:primaryTopic grel:dataset ;
+.
+
+<https://ben.de-meester.org/#me>
+    rdf:type  foaf:Person ;
+    foaf:mbox "mailto:Ben.DeMeester@UGent.be" ;
+    foaf:name "Ben De Meester"@en .
+
+grel:dataset
+    a                    void:Dataset ;
+    foaf:homepage        <https://github.com/OpenRefine/OpenRefine/wiki/General-Refine-Expression-Language> ;
+    foaf:homepage        <https://fno.io> ;
+    dcterms:title        "GREL Fno Descriptions"@en ;
+    dcterms:description  "The FnO descriptions of the GREL functions" ;
+    dcterms:contributor  <https://ben.de-meester.org/#me> ;
+    dcterms:modified     "2020-01-20"^^xsd:date ;
+    cc:license           <http://creativecommons.org/license/by/3.0/> ;
+    dcterms:issued       "2016-12-15"^^xsd:date ;
+    dcterms:rights       "Copyright © Ghent University – imec – IDLab"@en ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_(mathematics)> ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_model> ;
+    void:feature         <http://www.w3.org/ns/formats/Turtle> ;
+    void:exampleResource grel:boolean_and ;
+    void:vocabulary      <https://w3id.org/function/ontology#> .
+
+# Contents:
+# - Parameters (per java) param_{var} with predicate p_{type}_{var}
+# - Outputs (per java) output_{type} with predicate o_{type}
+# - Problems (per java) prob_{var}
+#   - Functions (per java)
+
+grel:prob_array
+    a                   fno:Problem ;
+    fno:name            "The array problem"^^xsd:string ;
+    dcterms:description ""^^xsd:string .
+
+grel:prob_array_join
+    a                   fno:Problem ;
+    fno:name            "The array join problem"^^xsd:string ;
+    dcterms:description "Joining an array into a string."^^xsd:string .
+
+grel:array_join
+    a                   fno:Function ;
+    fno:name            "join" ;
+    dcterms:description "join" ;
+    fno:solves          grel:prob_array_join ;
+    fno:expects         ( grel:param_a grel:param_string_sep ) ;
+    fno:returns         ( grel:stringOut ) .
+
+grel:param_a
+    a             fno:Parameter ;
+    fno:name      "a" ;
+    rdfs:label    "a" ;
+    fno:predicate grel:p_array_a ;
+    fno:type      rdf:List ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:param_string_sep
+    a             fno:Parameter ;
+    fno:name      "sep" ;
+    rdfs:label    "sep" ;
+    fno:predicate grel:p_string_sep ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:stringOut
+    a             fno:Output ;
+    fno:name      "output string" ;
+    rdfs:label    "output string" ;
+    fno:predicate grel:stringOutput ;
+    fno:type      xsd:string .
+
+grel:prob_bool
+    a                   fno:Problem ;
+    fno:name            "The bool problem"^^xsd:string ;
+    dcterms:description ""^^xsd:string .
+
+#AND
+
+grel:prob_and
+    a                   fno:Problem ;
+    fno:name            "The and problem"^^xsd:string ;
+    dcterms:description "Returning the logical AND between two (boolean) operands."^^xsd:string .
+
+grel:boolean_and
+    a                   fno:Function ;
+    fno:name            "and" ;
+    dcterms:description "and" ;
+    fno:solves          grel:prob_and ;
+    fno:expects         ( grel:bool_array_b ) ;
+    fno:returns         ( grel:output_bool ) .
+
+grel:bool_array_b
+    a             fno:Parameter ;
+    fno:name      "b" ;
+    rdfs:label    "b" ;
+    fno:predicate grel:param_rep_b ;
+    fno:type      rdf:List ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:output_bool
+    a             fno:Output ;
+    fno:name      "bool" ;
+    rdfs:label    "bool" ;
+    fno:predicate grel:o_bool ;
+    fno:type      xsd:boolean .
+
+#OR
+
+grel:prob_or
+    a                   fno:Problem ;
+    fno:name            "The or problem"^^xsd:string ;
+    dcterms:description "Returning the logical OR between two (boolean) operands."^^xsd:string .
+
+grel:boolean_or
+    a                   fno:Function ;
+    fno:name            "or" ;
+    dcterms:description "or" ;
+    fno:solves          grel:prob_or ;
+    fno:expects         ( grel:bool_array_b ) ;
+    fno:returns         ( grel:output_bool ) .
+
+#NOT
+
+grel:prob_not
+    a                   fno:Problem ;
+    fno:name            "The not problem"^^xsd:string ;
+    dcterms:description "Returning the boolean negation of the argument."^^xsd:string .
+
+grel:boolean_not
+    a                   fno:Function ;
+    fno:name            "not" ;
+    dcterms:description "not" ;
+    fno:solves          grel:prob_not ;
+    fno:expects         ( grel:param_b ) ;
+    fno:returns         ( grel:output_bool ) .
+
+grel:param_b
+    a             fno:Parameter ;
+    fno:name      "b" ;
+    rdfs:label    "b" ;
+    fno:predicate grel:bool_b ;
+    fno:type      xsd:boolean ;
+    fno:required  "true"^^xsd:boolean .
+
+#XOR
+
+grel:boolean_xor
+    a                   fno:Function ;
+    fno:name            "xor" ;
+    dcterms:description "xor" ;
+    fno:expects         ( grel:bool_array_b ) ;
+    fno:returns         ( grel:output_bool ) .
+
+#IFTHENELSE
+
+grel:prob_if
+    a                   fno:Problem ;
+    fno:name            "The if problem"^^xsd:string ;
+    dcterms:description "Doing an if-statement."^^xsd:string .
+
+grel:controls_if
+    a                   fno:Function ;
+    fno:name            "if" ;
+    dcterms:description "if" ;
+    fno:solves          grel:prob_if ;
+    fno:expects         ( grel:param_b grel:param_true grel:param_false ) ;
+    fno:returns         ( grel:output_any ) .
+
+grel:param_true
+    a             fno:Parameter ;
+    fno:name      "eTrue" ;
+    rdfs:label    "eTrue" ;
+    fno:predicate grel:any_true ;
+    fno:type      xsd:any ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:param_false
+    a             fno:Parameter ;
+    fno:name      "eFalse" ;
+    rdfs:label    "eFalse" ;
+    fno:predicate grel:any_false ;
+    fno:type      xsd:any ;
+    fno:required  "true"^^xsd:boolean .
+
+
+grel:output_any
+    a             fno:Parameter ;
+    #fno:name      "" ;
+    #rdfs:label    "" ;
+    fno:predicate grel:any_output ;
+    fno:type      rdf:object;
+    fno:required  "true"^^xsd:boolean .
+
+grel:prob_string
+    a                   fno:Problem ;
+    fno:name            "The string problem"^^xsd:string ;
+    dcterms:description ""^^xsd:string .
+
+#STRING_LENGTH
+
+grel:prob_strlen
+    a                   fno:Problem ;
+    fno:name            "The strlen problem"^^xsd:string ;
+    dcterms:description "Computing the length of a given input string."^^xsd:string .
+
+grel:string_length
+    a                   fno:Function ;
+    fno:name            "length" ;
+    dcterms:description "length" ;
+    fno:solves          grel:prob_strlen ;
+    fno:expects         ( grel:valueParam ) ;
+    fno:returns         ( grel:output_number ) .
+
+grel:valueParam
+    a             fno:Parameter ;
+    fno:name      "input value" ;
+    rdfs:label    "input value" ;
+    fno:predicate grel:valueParameter ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:output_number
+    a             fno:Output ;
+    fno:name      "number" ;
+    rdfs:label    "number" ;
+    fno:predicate grel:o_number ;
+    fno:type      xsd:number .
+
+#TODO toStringValue
+
+#STARTSWITH
+
+grel:prob_strstarts
+    a                   fno:Problem ;
+    fno:name            "The strstarts problem"^^xsd:string ;
+    dcterms:description "Whether a string starts another string"^^xsd:string .
+
+grel:string_startsWith
+    a                   fno:Function ;
+    fno:name            "startsWith" ;
+    dcterms:description "startsWith" ;
+    fno:solves          grel:prob_strstarts ;
+    fno:expects         ( grel:valueParam grel:param_string_sub ) ;
+    fno:returns         ( grel:output_bool ) .
+
+grel:param_string_sub
+    a             fno:Parameter ;
+    fno:name      "sub" ;
+    rdfs:label    "sub" ;
+    fno:predicate grel:string_sub ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#ENDSWITH
+
+grel:prob_strends
+    a                   fno:Problem ;
+    fno:name            "The strends problem"^^xsd:string ;
+    dcterms:description "Whether a string ends another string"^^xsd:string .
+
+grel:string_endsWith
+    a                   fno:Function ;
+    fno:name            "endsWith" ;
+    dcterms:description "endsWith" ;
+    fno:solves          grel:prob_strends ;
+    fno:expects         ( grel:valueParam grel:param_string_sub ) ;
+    fno:returns         ( grel:output_bool ) .
+
+#CONTAINS
+
+grel:prob_contains
+    a                   fno:Problem ;
+    fno:name            "The contains problem"^^xsd:string ;
+    dcterms:description "Whether a string contains another string"^^xsd:string .
+
+grel:string_contains
+    a                   fno:Function ;
+    fno:name            "contains" ;
+    dcterms:description "contains" ;
+    fno:solves          grel:prob_contains ;
+    fno:expects         ( grel:valueParam grel:param_string_sub ) ;
+    fno:returns         ( grel:output_bool ) .
+
+#TODO indexOf
+
+grel:string_indexOf
+    a                   fno:Function ;
+    fno:name            "indexOf" ;
+    dcterms:description "indexOf" ;
+    fno:expects         ( grel:valueParam grel:param_string_sub ) ;
+    fno:returns         ( grel:output_number ) .
+
+#grel:string_indexOf
+#    a                   fno:Function ;
+#    fno:name            "indexOf" ;
+#    dcterms:description "indexOf" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#TOLOWERCASE
+
+grel:prob_lcase
+    a                   fno:Problem ;
+    fno:name            "The lcase problem"^^xsd:string ;
+    dcterms:description "Converting a string to lower case characters."^^xsd:string .
+
+grel:toLowerCase
+    a                   fno:Function ;
+    fno:name            "to Lowercase" ;
+    rdfs:label          "to Lowercase" ;
+    dcterms:description "Returns the input with all letters in lower case." ;
+    fno:solves          grel:prob_lcase ;
+    fno:expects         ( grel:valueParam ) ;
+    fno:returns         ( grel:stringOut ) .
+
+#TOUPPERCASE
+
+grel:prob_ucase
+    a                   fno:Problem ;
+    fno:name            "The ucase problem"^^xsd:string ;
+    dcterms:description "Converting a string to upper case characters."^^xsd:string .
+
+grel:toUpperCase
+    a                   fno:Function ;
+    fno:name            "to Uppercase" ;
+    rdfs:label          "to Uppercase" ;
+    dcterms:description "Returns the input with all letters in upper case." ;
+    fno:solves          grel:prob_ucase ;
+    fno:expects         ( grel:valueParam ) ;
+    fno:returns         ( grel:stringOut ) .
+
+#TODO toTitleCase
+
+grel:string_toTitlecase
+    a                   fno:Function ;
+    fno:name            "toTitlecase" ;
+    dcterms:description "toTitlecase" ;
+    fno:expects         ( grel:valueParam ) ;
+    fno:returns         ( grel:stringOut ) .
+
+#TRIM
+
+#TODO Problem trim
+
+grel:string_trim
+    a                   fno:Function ;
+    fno:name            "trim" ;
+    dcterms:description "trim" ;
+    fno:expects         ( grel:valueParam ) ;
+    fno:returns         ( grel:stringOut ) .
+
+#TODO strip sameAs trim
+
+#grel:valueParamtrip
+#    a                   fno:Function ;
+#    fno:name            "strip" ;
+#    dcterms:description "strip" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO chomp
+
+grel:string_chomp
+    a                   fno:Function ;
+    fno:name            "chomp" ;
+    dcterms:description "chomp" ;
+    fno:expects         ( grel:valueParam grel:param_string_sep ) ;
+    fno:returns         ( grel:stringOut ) .
+
+#SUBSTRING
+
+grel:prob_substr
+    a                   fno:Problem ;
+    fno:name            "The substr problem"^^xsd:string ;
+    dcterms:description "Getting the sub-string of a given string"^^xsd:string .
+
+grel:string_substring
+    a                   fno:Function ;
+    fno:name            "substring" ;
+    dcterms:description "substring" ;
+    fno:solves          grel:prob_substr ;
+    fno:expects         ( grel:valueParam grel:p_int_i_from grel:p_int_i_opt_to ) ;
+    fno:returns         ( grel:stringOut ) .
+
+grel:p_int_i_from
+    a             fno:Parameter ;
+    fno:name      "from" ;
+    rdfs:label    "from" ;
+    fno:predicate grel:param_int_i_from ;
+    fno:type      xsd:int ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:p_int_i_opt_to
+    a             fno:Parameter ;
+    fno:name      "to" ;
+    rdfs:label    "to" ;
+    fno:predicate grel:param_int_i_opt_to ;
+    fno:type      xsd:string ;
+    fno:required  "false"^^xsd:boolean .
+
+# TODO slice sameAs substring
+
+#grel:valueParamlice
+#    a                   fno:Function ;
+#    fno:name            "slice" ;
+#    dcterms:description "slice" ;
+#    fno:expects         ( grel:valueParam grel:p_int_i_from grel:p_int_i_opt_to ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+# TODO get sameAs substring
+
+#grel:string_get
+#    a                   fno:Function ;
+#    fno:name            "get" ;
+#    dcterms:description "get" ;
+#    fno:expects         ( grel:valueParam grel:p_int_i_from grel:p_int_i_opt_to ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+# TODO lastIndexOf
+
+#grel:string_lastIndexOf
+#    a                   fno:Function ;
+#    fno:name            "lastIndexOf" ;
+#    dcterms:description "lastIndexOf" ;
+#    fno:expects         ( grel:valueParam grel:param_string_sub ) ;
+#    fno:returns         ( grel:output_number ) .
+
+# TODO replace
+
+grel:prob_replace
+    a        fno:Problem ;
+    fno:name "The replace problem"^^xsd:string ;
+    dcterms:description
+             "Replacing each non-overlapping occurrence of a regular expression pattern with a replacement string. Regular expession matching may involve modifier flags."^^xsd:string .
+
+#grel:string_replace
+#    a                   fno:Function ;
+#    fno:name            "replace" ;
+#    dcterms:description "replace" ;
+#    fno:solves          grel:prob_replace ;
+#    fno:expects         ( grel:valueParam grel:param_find grel:param_replace ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+grel:param_find
+    a             fno:Parameter ;
+    fno:name      "f" ;
+    rdfs:label    "f" ;
+    fno:predicate grel:p_string_find ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:param_replace
+    a             fno:Parameter ;
+    fno:name      "r" ;
+    rdfs:label    "r" ;
+    fno:predicate grel:p_string_replace ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO replaceChars
+
+#grel:string_replaceChars
+#    a                   fno:Function ;
+#    fno:name            "replaceChars" ;
+#    dcterms:description "replaceChars" ;
+#    fno:expects         ( grel:valueParam grel:param_find grel:param_replace ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO match
+
+grel:prob_regex
+    a        fno:Problem ;
+    fno:name "The regex problem"^^xsd:string ;
+    dcterms:description
+             "Returning true if a string (?arg1) matches the regular expression supplied as a pattern (?arg2) as influenced by the value of flags (?arg3), otherwise returns false."^^xsd:string .
+
+#grel:string_match
+#    a                   fno:Function ;
+#    fno:name            "match" ;
+#    dcterms:description "match" ;
+#    fno:expects         ( grel:valueParam grel:param_regex ) ;
+#    fno:returns         ( grel:output_array ) .
+
+grel:output_array
+    a             fno:Output ;
+    fno:name      "array" ;
+    rdfs:label    "array" ;
+    fno:predicate grel:o_array ;
+    fno:type      rdf:List .
+
+
+grel:param_regex
+    a             fno:Parameter ;
+    fno:name      "p" ;
+    rdfs:label    "p" ;
+    fno:predicate grel:p_string_regex ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO find
+
+#grel:string_find
+#    a                   fno:Function ;
+#    fno:name            "find" ;
+#    dcterms:description "find" ;
+#    fno:expects         ( grel:valueParam grel:param_regex ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO toNumber
+
+#grel:string_toNumber
+#    a                   fno:Function ;
+#    fno:name            "toNumber" ;
+#    dcterms:description "toNumber" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_number ) .
+
+grel:param_any_e
+    a             fno:Parameter ;
+    fno:name      "e" ;
+    rdfs:label    "e" ;
+    fno:predicate grel:p_any_e ;
+    fno:type      xsd:any ;
+    fno:required  "true"^^xsd:boolean .
+
+#SPLIT
+
+grel:string_split
+    a                   fno:Function ;
+    fno:name            "split" ;
+    dcterms:description "split" ;
+    fno:expects         ( grel:valueParam grel:param_string_sep ) ;
+    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#splitbylengthsstring-s-number-n1-number-n2-
+
+#grel:string_splitByLengths
+#    a                   fno:Function ;
+#    fno:name            "splitByLengths" ;
+#    dcterms:description "splitByLengths" ;
+#    fno:expects         ( grel:valueParam grel:param_int_i grel:param_int_i2 grel:param_int_rep_i ) ;
+#    fno:returns         ( grel:output_array ) .
+
+grel:param_int_i
+    a             fno:Parameter ;
+    fno:name      "d1" ;
+    rdfs:label    "d1" ;
+    fno:predicate grel:p_int_i ;
+    fno:type      xsd:int ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:param_int_i2
+    a             fno:Parameter ;
+    fno:name      "d2" ;
+    rdfs:label    "d2" ;
+    fno:predicate grel:p_int_i2 ;
+    fno:type      xsd:int ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:param_int_rep_i
+    a             fno:Parameter ;
+    fno:name      "n3" ;
+    rdfs:label    "n3" ;
+    fno:predicate grel:p_rep_i ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#smartsplitstring-s-optional-string-sep
+
+#grel:valueParammartSplit
+#    a                   fno:Function ;
+#    fno:name            "smartSplit" ;
+#    dcterms:description "smartSplit" ;
+#    fno:expects         ( grel:valueParam grel:param_opt_sep ) ;
+#    fno:returns         ( grel:output_array ) .
+
+grel:param_opt_sep
+    a             fno:Parameter ;
+    fno:name      "sep" ;
+    rdfs:label    "sep" ;
+    fno:predicate grel:p_opt_sep ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#splitbychartypes
+
+#grel:valueParamplitByCharType
+#    a                   fno:Function ;
+#    fno:name            "splitByCharType" ;
+#    dcterms:description "splitByCharType" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#partitionstring-s-string-or-regex-frag-optional-boolean-omitfragment
+
+#grel:string_partition
+#    a                   fno:Function ;
+#    fno:name            "partition" ;
+#    dcterms:description "partition" ;
+#    fno:expects         ( grel:valueParam grel:param_fragment grel:param_bool_opt_b ) ;
+#    fno:returns         ( grel:output_array ) .
+
+grel:param_fragment
+    a             fno:Parameter ;
+    fno:name      "frag" ;
+    rdfs:label    "frag" ;
+    fno:predicate grel:p_fragment ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:param_bool_opt_b
+    a             fno:Parameter ;
+    fno:name      "b?" ;
+    rdfs:label    "b?" ;
+    fno:predicate grel:p_bool_opt_b ;
+    fno:type      xsd:boolean ;
+    fno:required  "false"^^xsd:boolean .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#rpartitionstring-s-string-or-regex-frag-optional-boolean-omitfragment
+
+#grel:string_rpartition
+#    a                   fno:Function ;
+#    fno:name            "rpartition" ;
+#    dcterms:description "rpartition" ;
+#    fno:expects         ( grel:valueParam grel:param_fragment grel:param_bool_opt_b ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#diffo1-o2-optional-string-timeunit
+
+#grel:string_diff
+#    a                   fno:Function ;
+#    fno:name            "diff" ;
+#    dcterms:description "diff" ;
+#    fno:expects         ( grel:valueParam grel:valueParam2 ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+grel:valueParam2
+    a             fno:Parameter ;
+    fno:name      "input value 2" ;
+    rdfs:label    "input value 2" ;
+    fno:predicate grel:valueParameter2 ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#ESCAPE
+
+grel:prob_encode_for_uri
+    a                   fno:Problem ;
+    fno:name            "The encode_for_uri problem"^^xsd:string ;
+    dcterms:description "encoding for a URI"^^xsd:string .
+
+grel:escape
+    a                   fno:Function ;
+    fno:name            "escape" ;
+    rdfs:label          "escape" ;
+    dcterms:description "Escapes a string, with a mode parameter." ;
+    fno:solves          grel:prob_encode_for_uri ;
+    fno:expects         ( grel:valueParam grel:modeParam ) ;
+    fno:returns         ( grel:stringOut ) .
+
+grel:modeParam
+    a             fno:Parameter ;
+    fno:name      "mode value" ;
+    rdfs:label    "mode value" ;
+    fno:type      xsd:string ;
+    fno:predicate grel:modeParameter ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#unescapestring-s-string-mode
+
+#grel:string_unescape
+#    a                   fno:Function ;
+#    fno:name            "unescape" ;
+#    dcterms:description "unescape" ;
+#    fno:expects         ( grel:valueParam grel:modeParam ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#md5string-s
+
+grel:prob_crypto
+    a                   fno:Problem ;
+    fno:name            "The crypto problem"^^xsd:string ;
+    dcterms:description ""^^xsd:string .
+
+grel:prob_md5
+    a                   fno:Problem ;
+    fno:name            "The md5 problem"^^xsd:string ;
+    dcterms:description "Calculating the md5 checksum."^^xsd:string .
+
+#grel:string_md5
+#    a                   fno:Function ;
+#    fno:name            "md5" ;
+#    dcterms:description "md5" ;
+#    fno:solves          grel:prob_md5 ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#sha1string-s
+
+grel:prob_sha1
+    a                   fno:Problem ;
+    fno:name            "The sha1 problem"^^xsd:string ;
+    dcterms:description "Calculating the SHA1 checksum."^^xsd:string .
+
+#grel:string_sha1
+#    a                   fno:Function ;
+#    fno:name            "sha1" ;
+#    dcterms:description "sha1" ;
+#    fno:solves          grel:prob_sha1 ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#phoneticstring-s-string-encoding
+
+#grel:string_phonetic
+#    a                   fno:Function ;
+#    fno:name            "phonetic" ;
+#    dcterms:description "phonetic" ;
+#    fno:expects         ( grel:valueParam grel:valueParamtring_encoding ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+grel:valueParamtring_encoding
+    a             fno:Parameter ;
+    fno:name      "encoding" ;
+    rdfs:label    "encoding" ;
+    fno:predicate grel:p_encoding ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#reinterpretstring-s-string-encoder
+
+#grel:string_reinterpret
+#    a                   fno:Function ;
+#    fno:name            "reinterpret" ;
+#    dcterms:description "reinterpret" ;
+#    fno:expects         ( grel:valueParam grel:valueParamtring_encoder ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+grel:valueParamtring_encoder
+    a             fno:Parameter ;
+    fno:name      "encoder" ;
+    rdfs:label    "encoder" ;
+    fno:predicate grel:p_encoder ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#fingerprintstring-s
+
+#grel:string_fingerprint
+#    a                   fno:Function ;
+#    fno:name            "fingerprint" ;
+#    dcterms:description "fingerprint" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#ngramstring-s-number-n
+
+#grel:string_ngram
+#    a                   fno:Function ;
+#    fno:name            "ngram" ;
+#    dcterms:description "ngram" ;
+#    fno:expects         ( grel:valueParam grel:param_int_i ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#ngramfingerprintstring-s-number-n
+
+#grel:string_ngramFingerprint
+#    a                   fno:Function ;
+#    fno:name            "ngramFingerprint" ;
+#    dcterms:description "ngramFingerprint" ;
+#    fno:expects         ( grel:valueParam grel:param_int_i ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#unicodestring-s
+
+#grel:string_unicode
+#    a                   fno:Function ;
+#    fno:name            "unicode" ;
+#    dcterms:description "unicode" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#unicodetypestring-s
+
+#grel:string_unicodeType
+#    a                   fno:Function ;
+#    fno:name            "unicodeType" ;
+#    dcterms:description "unicodeType" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#mqlkeyquotestring-s
+
+#grel:string_mqlKeyQuote
+#    a                   fno:Function ;
+#    fno:name            "mqlKeyQuote" ;
+#    dcterms:description "mqlKeyQuote" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#TODO https://github.com/OpenRefine/OpenRefine/wiki/GREL-String-Functions#mqlkeyunquotestring-key
+
+grel:string_mqlKeyUnquote
+    a                   fno:Function ;
+    fno:name            "mqlKeyUnquote" ;
+    dcterms:description "mqlKeyUnquote" ;
+    fno:expects         ( grel:valueParamtring_key ) ;
+    fno:returns         ( grel:stringOut ) .
+
+grel:valueParamtring_key
+    a             fno:Parameter ;
+    fno:name      "key" ;
+    rdfs:label    "key" ;
+    fno:predicate grel:p_key ;
+    fno:type      xsd:string ;
+    fno:required  "true"^^xsd:boolean .
+
+grel:prob_date
+    a                   fno:Problem ;
+    fno:name            "The date problem"^^xsd:string ;
+    dcterms:description ""^^xsd:string .
+
+grel:prob_timezone
+    a                   fno:Problem ;
+    fno:name            "The timezone problem"^^xsd:string ;
+    dcterms:description "Getting the timezone of a string."^^xsd:string .
+
+grel:prob_day
+    a                   fno:Problem ;
+    fno:name            "The day problem"^^xsd:string ;
+    dcterms:description "Extracting the day from a date/time literal."^^xsd:string .
+
+grel:prob_month
+    a                   fno:Problem ;
+    fno:name            "The month problem"^^xsd:string ;
+    dcterms:description "Extracting the month from a date/time literal."^^xsd:string .
+
+grel:prob_hours
+    a                   fno:Problem ;
+    fno:name            "The hours problem"^^xsd:string ;
+    dcterms:description "Extracting the hours from a date/time literal."^^xsd:string .
+
+grel:prob_seconds
+    a                   fno:Problem ;
+    fno:name            "The seconds problem"^^xsd:string ;
+    dcterms:description "Extracting the seconds from a date/time literal."^^xsd:string .
+
+grel:prob_minutes
+    a                   fno:Problem ;
+    fno:name            "The minutes problem"^^xsd:string ;
+    dcterms:description "Extracting the minutes from a date/time literal."^^xsd:string .
+
+grel:prob_year
+    a                   fno:Problem ;
+    fno:name            "The year problem"^^xsd:string ;
+    dcterms:description "Extracting the year from a date/time literal."^^xsd:string .
+
+#grel:date_datePart
+#    a                   fno:Function ;
+#    fno:name            "datePart" ;
+#    dcterms:description "datePart" ;
+#    fno:expects         ( grel:date_d grel:string_unit ) ;
+#    fno:returns         ( grel:output_any ) .
+
+#grel:date_d
+#    a             fno:Parameter ;
+#    fno:name      "d" ;
+#    rdfs:label    "d" ;
+#    fno:predicate grel:param_d ;
+#    fno:type      xsd:date ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:string_unit
+#    a             fno:Parameter ;
+#    fno:name      "unit" ;
+#    rdfs:label    "unit" ;
+#    fno:predicate grel:param_unit ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+grel:prob_now
+    a                   fno:Problem ;
+    fno:name            "The now problem"^^xsd:string ;
+    dcterms:description "Getting the current date and time."^^xsd:string .
+
+#grel:date_now
+#    a                   fno:Function ;
+#    fno:name            "now" ;
+#    dcterms:description "now" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_datetime ) .
+
+#TODO output_datetime
+
+grel:prob_mathematical
+    a                   fno:Problem ;
+    fno:name            "The mathematical problem"^^xsd:string ;
+    dcterms:description ""^^xsd:string .
+
+grel:prob_floor
+    a        fno:Problem ;
+    fno:name "The floor problem"^^xsd:string ;
+    dcterms:description
+             "Returning the largest (closest to positive infinity) number with no fractional part that is not greater than the given value."^^xsd:string .
+
+#grel:math_floor
+#    a                   fno:Function ;
+#    fno:name            "floor" ;
+#    dcterms:description "floor" ;
+#    fno:solves          grel:prob_floor ;
+#    fno:expects         ( grel:dec_n ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:dec_n
+#    a             fno:Parameter ;
+#    fno:name      "d" ;
+#    rdfs:label    "d" ;
+#    fno:predicate grel:param_n ;
+#    fno:type      xsd:decimal ;
+#    fno:required  "true"^^xsd:boolean .
+
+#<https://www.w3.org/TR/sparql11-query/#func-floor>
+#    skos:broader grel:math_floor .
+
+grel:prob_max
+    a                   fno:Problem ;
+    fno:name            "The max problem"^^xsd:string ;
+    dcterms:description "Returning the largest value of the input."^^xsd:string .
+
+#grel:math_max
+#    a                   fno:Function ;
+#    fno:name            "max" ;
+#    dcterms:description "max" ;
+#    fno:solves          grel:prob_max ;
+#    fno:expects         ( grel:dec_n grel:dec_n2 ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:dec_n2
+#    a             fno:Parameter ;
+#    fno:name      "d2" ;
+#    rdfs:label    "d2" ;
+#    fno:predicate grel:param_n2 ;
+#    fno:type      xsd:decimal ;
+#    fno:required  "true"^^xsd:boolean .
+
+grel:prob_min
+    a                   fno:Problem ;
+    fno:name            "The min problem"^^xsd:string ;
+    dcterms:description "Returning the smallest value of the input."^^xsd:string .
+
+#grel:math_min
+#    a                   fno:Function ;
+#    fno:name            "min" ;
+#    dcterms:description "min" ;
+#    fno:solves         grel:prob_min ;
+#    fno:expects         ( grel:dec_n grel:dec_n2 ) ;
+#    fno:returns         ( grel:output_number ) .
+
+grel:prob_round
+    a        fno:Problem ;
+    fno:name "The round problem"^^xsd:string ;
+    dcterms:description
+             "Returning the number with no fractional part that is closest to the argument. If there are two such numbers, then the one that is closest to positive infinity is returned."^^xsd:string .
+
+#grel:math_round
+#    a                   fno:Function ;
+#    fno:name            "round" ;
+#    dcterms:description "round" ;
+#    fno:solves          grel:prob_round ;
+#    fno:expects         ( grel:dec_n ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#<https://www.w3.org/TR/sparql11-query/#func-round>
+#    skos:broader grel:math_round .
+
+grel:prob_ceil
+    a        fno:Problem ;
+    fno:name "The ceil problem"^^xsd:string ;
+    dcterms:description
+             "Returning the smallest (closest to negative infinity) number with no fractional part that is not less than the value of arg."^^xsd:string .
+
+#grel:math_ceil
+#    a                   fno:Function ;
+#    fno:name            "ceil" ;
+#    dcterms:description "ceil" ;
+#    fno:solves          grel:prob_ceil ;
+#    fno:expects         ( grel:dec_n ) ;
+#    fno:returns         ( grel:output_number ) .
+
+grel:prob_coalesce
+    a                   fno:Problem ;
+    fno:name            "The coalesce problem"^^xsd:string ;
+    dcterms:description "Returning the first bound argument."^^xsd:string .
+
+#grel:other_coalesce
+#    a                   fno:Function ;
+#    fno:name            "coalesce" ;
+#    dcterms:description "coalesce" ;
+#    fno:solves          grel:prob_coalesce ;
+#    fno:expects         ( grel:any_rep_e ) ;
+#    fno:returns         ( grel:output_any ) .
+
+# HERE
+
+#grel:param_b2
+#    a             fno:Parameter ;
+#    fno:name      "b2" ;
+#    rdfs:label    "b2" ;
+#    fno:predicate grel:bool_b2 ;
+#    fno:type      xsd:boolean ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:bool_rep_b
+#    a             fno:Parameter ;
+#    fno:name      "b3" ;
+#    rdfs:label    "b3" ;
+#    fno:predicate grel:param_rep_b ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:date_d2
+#    a             fno:Parameter ;
+#    fno:name      "d2" ;
+#    rdfs:label    "d2" ;
+#    fno:predicate grel:param_d2 ;
+#    fno:type      xsd:date ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:dec_n_exp
+#    a             fno:Parameter ;
+#    fno:name      "e" ;
+#    rdfs:label    "e" ;
+#    fno:predicate grel:p_any_exp ;
+#    fno:type      xsd:decimal ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:string_field
+#    a             fno:Parameter ;
+#    fno:name      "field" ;
+#    rdfs:label    "field" ;
+#    fno:predicate grel:param_field ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:string_format
+#    a             fno:Parameter ;
+#    fno:name      "format" ;
+#    rdfs:label    "format" ;
+#    fno:predicate grel:param_format ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:string_rep_format
+#    a             fno:Parameter ;
+#    fno:name      "format1" ;
+#    rdfs:label    "format1" ;
+#    fno:predicate grel:param_rep_format ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:uri_index
+#    a             fno:Parameter ;
+#    fno:name      "i" ;
+#    rdfs:label    "i" ;
+#    fno:predicate grel:p_int_index ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:any_rep_e
+#    a             fno:Parameter ;
+#    fno:name      "o1" ;
+#    rdfs:label    "o1" ;
+#    fno:predicate grel:param_rep_e ;
+#    fno:type      xsd:any ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:bool_opt_omit
+#    a             fno:Parameter ;
+#    fno:name      "omitFragment" ;
+#    rdfs:label    "omitFragment" ;
+#    fno:predicate grel:param_omit ;
+#    fno:type      xsd:string ;
+#    fno:required  "false"^^xsd:boolean .
+
+#grel:param_int_i_step
+#    a             fno:Parameter ;
+#    fno:name      "step" ;
+#    rdfs:label    "step" ;
+#    fno:predicate grel:string_step ;
+#    fno:type      xsd:int ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:string_time_unit
+#    a             fno:Parameter ;
+#    fno:name      "timeUnit" ;
+#    rdfs:label    "timeUnit" ;
+#    fno:predicate grel:param_time_unit ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:param_int_i_to
+#    a             fno:Parameter ;
+#    fno:name      "to" ;
+#    rdfs:label    "to" ;
+#    fno:predicate grel:param_to ;
+#    fno:type      xsd:int ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:uri_value
+#    a             fno:Parameter ;
+#    fno:name      "v" ;
+#    rdfs:label    "v" ;
+#    fno:predicate grel:param_value ;
+#    fno:type      xsd:string ;
+#    fno:required  "true"^^xsd:boolean .
+
+#grel:controls_forEachIndex
+#    a                   fno:Function ;
+#    fno:name            "forEachIndex" ;
+#    dcterms:description "forEachIndex" ;
+#    fno:expects         ( grel:param_a grel:uri_index grel:uri_value grel:param_any_e ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:controls_forNonBlank
+#    a                   fno:Function ;
+#    fno:name            "forNonBlank" ;
+#    dcterms:description "forNonBlank" ;
+#    fno:expects         ( grel:param_any_e grel:uri_value grel:param_false grel:param_true ) ;
+#    fno:returns         ( grel:output_any ) .
+
+#grel:date_toDate
+#    a                   fno:Function ;
+#    fno:name            "toDate" ;
+#    dcterms:description "toDate" ;
+#    fno:expects         ( grel:param_any_e grel:string_rep_format ) ;
+#    fno:returns         ( grel:output_date ) .
+
+#grel:array_sum
+#    a                   fno:Function ;
+#    fno:name            "sum" ;
+#    dcterms:description "sum" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:controls_forRange
+#    a                   fno:Function ;
+#    fno:name            "forRange" ;
+#    dcterms:description "forRange" ;
+#    fno:expects         ( grel:p_int_i_from grel:inti_i_to grel:param_int_i_step grel:uri_value grel:param_any_e ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:other_facetCount
+#    a                   fno:Function ;
+#    fno:name            "facetCount" ;
+#    dcterms:description "facetCount" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:other_cross
+#    a                   fno:Function ;
+#    fno:name            "cross" ;
+#    dcterms:description "cross" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:controls_filter
+#    a                   fno:Function ;
+#    fno:name            "filter" ;
+#    dcterms:description "filter" ;
+#    fno:expects         ( grel:param_a grel:uri_value grel:param_any_e ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:controls_forEach
+#    a                   fno:Function ;
+#    fno:name            "forEach" ;
+#    dcterms:description "forEach" ;
+#    fno:expects         ( grel:param_a grel:uri_value grel:param_any_e ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:controls_with
+#    a                   fno:Function ;
+#    fno:name            "with" ;
+#    dcterms:description "with" ;
+#    fno:expects         ( grel:param_any_e grel:uri_value grel:param_any_e ) ;
+#    fno:returns         ( grel:output_any ) .
+
+#grel:date_diff
+#    a                   fno:Function ;
+#    fno:name            "diff" ;
+#    dcterms:description "diff" ;
+#    fno:expects         ( grel:date_d grel:date_d2 grel:string_time_unit ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:array_get
+#    a                   fno:Function ;
+#    fno:name            "get" ;
+#    dcterms:description "get" ;
+#    fno:expects         ( grel:param_a grel:p_int_i_from grel:p_int_i_opt_to ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:array_slice
+#    a                   fno:Function ;
+#    fno:name            "slice" ;
+#    dcterms:description "slice" ;
+#    fno:expects         ( grel:param_a grel:p_int_i_from grel:p_int_i_opt_to ) ;
+#    fno:returns         ( grel:output_number ) .
+
+
+#grel:date_inc
+#    a                   fno:Function ;
+#    fno:name            "inc" ;
+#    dcterms:description "inc" ;
+#    fno:expects         ( grel:date_d grel:dec_n grel:string_unit ) ;
+#    fno:returns         ( grel:output_date ) .
+
+#grel:date_toDate
+#    a                   fno:Function ;
+#    fno:name            "toDate" ;
+#    dcterms:description "toDate" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_date ) .
+
+#grel:math_mod
+#    a                   fno:Function ;
+#    fno:name            "mod" ;
+#    dcterms:description "mod" ;
+#    fno:expects         ( grel:param_int_i grel:param_int_i2 ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:math_pow
+#    a                   fno:Function ;
+#    fno:name            "pow" ;
+#    dcterms:description "pow" ;
+#    fno:expects         ( grel:dec_n grel:dec_n_exp ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:other_get
+#    a                   fno:Function ;
+#    fno:name            "get" ;
+#    dcterms:description "get" ;
+#    fno:expects         ( grel:param_any_e grel:string_field ) ;
+#    fno:returns         ( grel:output_any ) .
+
+#grel:date_toString
+#    a                   fno:Function ;
+#    fno:name            "toString" ;
+#    dcterms:description "toString" ;
+#    fno:expects         ( grel:date_d grel:string_format ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:other_hasField
+#    a                   fno:Function ;
+#    fno:name            "hasField" ;
+#    dcterms:description "hasField" ;
+#    fno:expects         ( grel:param_any_e grel:string_field ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:other_htmlAttr
+#    a                   fno:Function ;
+#    fno:name            "htmlAttr" ;
+#    dcterms:description "htmlAttr" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_any ) .
+
+#grel:other_select
+#    a                   fno:Function ;
+#    fno:name            "select" ;
+#    dcterms:description "select" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:output_element ) .
+
+#grel:array_length
+#    a                   fno:Function ;
+#    fno:name            "length" ;
+#    dcterms:description "length" ;
+#    fno:expects         ( grel:param_a ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:array_reverse
+#    a                   fno:Function ;
+#    fno:name            "reverse" ;
+#    dcterms:description "reverse" ;
+#    fno:expects         ( grel:param_a ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:math_sum
+#    a                   fno:Function ;
+#    fno:name            "sum" ;
+#    dcterms:description "sum" ;
+#    fno:expects         ( grel:param_a ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:array_uniques
+#    a                   fno:Function ;
+#    fno:name            "uniques" ;
+#    dcterms:description "uniques" ;
+#    fno:expects         ( grel:param_a ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:array_sort
+#    a                   fno:Function ;
+#    fno:name            "sort" ;
+#    dcterms:description "sort" ;
+#    fno:expects         ( grel:param_a ) ;
+#    fno:returns         ( grel:output_array ) .
+
+#grel:math_exp
+#    a                   fno:Function ;
+#    fno:name            "exp" ;
+#    dcterms:description "exp" ;
+#    fno:expects         ( grel:dec_n ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:math_ln
+#    a                   fno:Function ;
+#    fno:name            "ln" ;
+#    dcterms:description "ln" ;
+#    fno:expects         ( grel:dec_n ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:math_log
+#    a                   fno:Function ;
+#    fno:name            "log" ;
+#    dcterms:description "log" ;
+#    fno:expects         ( grel:dec_n ) ;
+#    fno:returns         ( grel:output_number ) .
+
+#grel:controls_isBlank
+#    a                   fno:Function ;
+#    fno:name            "isBlank" ;
+#    dcterms:description "isBlank" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:controls_isError
+#    a                   fno:Function ;
+#    fno:name            "isError" ;
+#    dcterms:description "isError" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:controls_isNonBlank
+#    a                   fno:Function ;
+#    fno:name            "isNonBlank" ;
+#    dcterms:description "isNonBlank" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:controls_isNotNull
+#    a                   fno:Function ;
+#    fno:name            "isNotNull" ;
+#    dcterms:description "isNotNull" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:controls_isNull
+#    a                   fno:Function ;
+#    fno:name            "isNull" ;
+#    dcterms:description "isNull" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:controls_isNumeric
+#    a                   fno:Function ;
+#    fno:name            "isNumeric" ;
+#    dcterms:description "isNumeric" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:output_bool ) .
+
+#grel:other_htmlText
+#    a                   fno:Function ;
+#    fno:name            "htmlText" ;
+#    dcterms:description "htmlText" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:other_innerHtml
+#    a                   fno:Function ;
+#    fno:name            "innerHtml" ;
+#    dcterms:description "innerHtml" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:other_outerHtml
+#    a                   fno:Function ;
+#    fno:name            "outerHtml" ;
+#    dcterms:description "outerHtml" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:other_ownText
+#    a                   fno:Function ;
+#    fno:name            "ownText" ;
+#    dcterms:description "ownText" ;
+#    fno:expects         ( ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:other_type
+#    a                   fno:Function ;
+#    fno:name            "type" ;
+#    dcterms:description "type" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:other_parseHtml
+#    a                   fno:Function ;
+#    fno:name            "parseHtml" ;
+#    dcterms:description "parseHtml" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:output_element ) .
+
+#grel:other_parseJson
+#    a                   fno:Function ;
+#    fno:name            "parseJson" ;
+#    dcterms:description "parseJson" ;
+#    fno:expects         ( grel:valueParam ) ;
+#    fno:returns         ( grel:output_any ) .
+
+#grel:other_jsonize
+#    a                   fno:Function ;
+#    fno:name            "jsonize" ;
+#    dcterms:description "jsonize" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:stringOut ) .
+
+#grel:string_toString
+#    a                   fno:Function ;
+#    fno:name            "toString" ;
+#    dcterms:description "toString" ;
+#    fno:expects         ( grel:param_any_e ) ;
+#    fno:returns         ( grel:stringOut ) .
+
diff --git a/src/main/resources/functions_idlab.ttl b/src/main/resources/functions_idlab.ttl
new file mode 100644
index 00000000..c28d299a
--- /dev/null
+++ b/src/main/resources/functions_idlab.ttl
@@ -0,0 +1,210 @@
+@prefix cc:      <http://creativecommons.org/ns#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix fno:     <https://w3id.org/function/ontology#> .
+@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
+@prefix grel:    <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix void:    <http://rdfs.org/ns/void#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+grel:void
+    a                 void:DatasetDescription ;
+    dcterms:title     "A VoID Description of the GREL Fno Descriptions Dataset" ;
+    dcterms:creator   <https://ben.de-meester.org/#me> ;
+    foaf:primaryTopic grel:dataset ;
+.
+
+<https://ben.de-meester.org/#me>
+    rdf:type  foaf:Person ;
+    foaf:mbox "mailto:Ben.DeMeester@UGent.be" ;
+    foaf:name "Ben De Meester"@en .
+
+grel:dataset
+    a                    void:Dataset ;
+    foaf:homepage        <https://github.com/OpenRefine/OpenRefine/wiki/General-Refine-Expression-Language> ;
+    foaf:homepage        <https://fno.io> ;
+    dcterms:title        "FnO descriptions for IDLab functions"@en ;
+    dcterms:description  "The FnO descriptions of the IDLab functions" ;
+    dcterms:contributor  <https://ben.de-meester.org/#me> ;
+    dcterms:modified     "2020-06-16"^^xsd:date ;
+    cc:license           <http://creativecommons.org/license/by/3.0/> ;
+    dcterms:issued       "2016-12-15"^^xsd:date ;
+    dcterms:rights       "Copyright © Ghent University – imec – IDLab"@en ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_(mathematics)> ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_model> ;
+    void:feature         <http://www.w3.org/ns/formats/Turtle> ;
+    void:exampleResource grel:boolean_and ;
+    void:vocabulary      <https://w3id.org/function/ontology#> .
+
+# Contents:
+# - Parameters (per java) param_{var} with predicate p_{type}_{var}
+# - Outputs (per java) output_{type} with predicate o_{type}
+# - Problems (per java) prob_{var}
+#   - Functions (per java)
+
+
+
+grel:prob_ucase
+    a                   fno:Problem ;
+    fno:name            "The ucase problem"^^xsd:string ;
+    dcterms:description "Converting a string to upper case characters."^^xsd:string .
+
+
+
+idlab-fn:toUpperCaseURL
+    a                   fno:Function ;
+    fno:name            "toUppercaseURL" ;
+    rdfs:label          "toUppercaseURL" ;
+    dcterms:description "Returns an uppercase, valid url." ;
+    fno:solves          grel:prob_ucase ;
+    fno:expects         ( idlab-fn:_str ) ;
+    fno:returns         ( idlab-fn:_stringOut ) .
+
+
+idlab-fn:trueCondition
+    a                   fno:Function ;
+    fno:name            "True condition" ;
+    rdfs:label          "True condition" ;
+    dcterms:description "Returns the value if the given boolean is true, else null" ;
+    fno:expects         ( idlab-fn:_strBoolean idlab-fn:_str ) ;
+    fno:returns         ( idlab-fn:_stringOut ) .
+
+idlab-fn:equal
+    a                   fno:Function ;
+    fno:name            "equal" ;
+    rdfs:label          "equal" ;
+    dcterms:description "Returns true if strings are equal." ;
+    fno:expects         ( grel:valueParam grel:valueParam2 ) ;
+    fno:returns         ( grel:stringOut ) .
+
+idlab-fn:notEqual
+    a                   fno:Function ;
+    fno:name            "not equal" ;
+    rdfs:label          "not equal" ;
+    dcterms:description "Returns true if strings are not equal." ;
+    fno:expects         ( grel:valueParam grel:valueParam2 ) ;
+    fno:returns         ( grel:stringOut ) .
+
+idlab-fn:stringContainsOtherString
+    a                   fno:Function ;
+    fno:name            "stringContainsOtherString" ;
+    rdfs:label          "stringContainsOtherString" ;
+    dcterms:description "Returns true if a string is found in a delimited string." ;
+    fno:expects         ( idlab-fn:_str idlab-fn:_otherStr idlab-fn:_delimiter ) ;
+    fno:returns         ( idlab-fn:_stringOut ) .
+
+
+
+idlab-fn:random
+    a                   fno:Function ;
+    fno:name            "random" ;
+    rdfs:label          "random" ;
+    dcterms:description "Returns a random uuid." ;
+    fno:expects         ( ) ;
+    fno:returns         ( idlab-fn:_stringOut ) .
+
+idlab-fn:_path
+    a             fno:Parameter ;
+    fno:name      "input path" ;
+    rdfs:label    "input path" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:path .
+
+idlab-fn:_str
+    a             fno:Parameter ;
+    fno:name      "input string" ;
+    rdfs:label    "input string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:str .
+
+idlab-fn:_strBoolean
+    a             fno:Parameter ;
+    fno:name      "boolean encoded as string" ;
+    rdfs:label    "boolean encoded as string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:strBoolean .
+
+idlab-fn:_endpoint
+    a             fno:Parameter ;
+    fno:name      "endpoint url string" ;
+    rdfs:label    "endpoint url string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:endpoint .
+
+idlab-fn:_otherStr
+    a             fno:Parameter ;
+    fno:name      "other input string" ;
+    rdfs:label    "other input string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:otherStr .
+
+idlab-fn:_expectedStr
+    a             fno:Parameter ;
+    fno:name      "expected input string" ;
+    rdfs:label    "expected input string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:expectedStr .
+
+idlab-fn:_result
+    a             fno:Parameter ;
+    fno:name      "result string" ;
+    rdfs:label    "result string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:result .
+
+idlab-fn:_list
+    a             fno:Parameter ;
+    fno:name      "list" ;
+    rdfs:label    "list" ;
+    fno:type      rdf:List ;
+    fno:predicate idlab-fn:list .
+
+idlab-fn:_listOut
+    a             fno:Parameter ;
+    fno:name      "output list" ;
+    rdfs:label    "output list" ;
+    fno:type      rdf:List ;
+    fno:predicate idlab-fn:listOut .
+
+idlab-fn:_delimiter
+    a             fno:Parameter ;
+    fno:name      "delimiter" ;
+    rdfs:label    "delimiter" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:delimiter .
+
+idlab-fn:_test
+    a             fno:Parameter ;
+    fno:name      "test" ;
+    rdfs:label    "test" ;
+    fno:type      xsd:double ;
+    fno:predicate idlab-fn:p_test .
+
+idlab-fn:_from
+    a             fno:Parameter ;
+    fno:name      "from" ;
+    rdfs:label    "from" ;
+    fno:type      xsd:double ;
+    fno:predicate idlab-fn:p_from .
+
+idlab-fn:_to
+    a             fno:Parameter ;
+    fno:name      "to" ;
+    rdfs:label    "to" ;
+    fno:type      xsd:double ;
+    fno:predicate idlab-fn:p_to .
+
+idlab-fn:_stringOut
+    a             fno:Output ;
+    fno:name      "output string" ;
+    rdfs:label    "output string" ;
+    fno:type      xsd:string ;
+    fno:predicate idlab-fn:stringOut .
+
+idlab-fn:_boolOut
+    a             fno:Output ;
+    fno:name      "output boolean" ;
+    rdfs:label    "output boolean" ;
+    fno:type      xsd:boolean ;
+    fno:predicate idlab-fn:o_boolOut .
diff --git a/src/main/resources/grel_java_mapping.ttl b/src/main/resources/grel_java_mapping.ttl
new file mode 100644
index 00000000..ba3c6341
--- /dev/null
+++ b/src/main/resources/grel_java_mapping.ttl
@@ -0,0 +1,322 @@
+@prefix cc:      <http://creativecommons.org/ns#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix doap:    <http://usefulinc.com/ns/doap#> .
+@prefix fno:     <https://w3id.org/function/ontology#> .
+@prefix fnoi:    <https://w3id.org/function/vocabulary/implementation#> .
+@prefix fnom:    <https://w3id.org/function/vocabulary/mapping#> .
+@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
+@prefix grel:    <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix grelm:   <http://fno.io/grel/rmlmapping#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix void:    <http://rdfs.org/ns/void#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+grelm:void
+    a                 void:DatasetDescription ;
+    dcterms:title     "A VoID Description of the GREL Fno JAVA Mapping Descriptions Dataset" ;
+    dcterms:creator   <https://ben.de-meester.org/#me> ;
+    foaf:primaryTopic grelm:dataset ;
+.
+
+<https://ben.de-meester.org/#me>
+    rdf:type  foaf:Person ;
+    foaf:mbox "mailto:Ben.DeMeester@UGent.be" ;
+    foaf:name "Ben De Meester"@en .
+
+grelm:dataset
+    a                    void:Dataset ;
+    foaf:homepage        <https://github.com/OpenRefine/OpenRefine/wiki/General-Refine-Expression-Language> ;
+    foaf:homepage        <https://fno.io> ;
+    dcterms:title        "GREL Fno JAVA Mapping Descriptions"@en ;
+    dcterms:description  "The FnO JAVA mapping descriptions of the GREL functions" ;
+    dcterms:contributor  <https://ben.de-meester.org/#me> ;
+    dcterms:modified     "2020-01-21"^^xsd:date ;
+    cc:license           <http://creativecommons.org/license/by/3.0/> ;
+    dcterms:issued       "2020-01-21"^^xsd:date ;
+    dcterms:rights       "Copyright © Ghent University – imec – IDLab"@en ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_(mathematics)> ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_model> ;
+    void:feature         <http://www.w3.org/ns/formats/Turtle> ;
+    void:exampleResource grelm:boolean_and ;
+    void:vocabulary      <https://w3id.org/function/ontology#>, <https://w3id.org/function/vocabulary/implementation#>,
+                         <https://w3id.org/function/vocabulary/mapping#> .
+
+# Contents:
+# - Parameters (per java) param_{var} with predicate p_{type}_{var}
+# - Outputs (per java) output_{type} with predicate o_{type}
+# - Problems (per java) prob_{var}
+#   - Functions (per java)
+
+grelm:javaArray
+    a                  fnoi:JavaClass ;
+    doap:download-page "GrelFunctions.jar" ;
+    fnoi:class-name    "io.fno.grel.ArrayFunctions" .
+
+#CONCAT
+
+grelm:getMapping
+    a                    fno:Mapping ;
+    fno:function         grel:array_get ;
+    fno:implementation   grelm:javaArray ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "get" ] ;
+.
+
+#CONCAT
+
+grelm:joinMapping
+    a                    fno:Mapping ;
+    fno:function         grel:array_join ;
+    fno:implementation   grelm:javaArray ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "join" ] ;
+.
+
+grelm:javaBoolean
+    a                  fnoi:JavaClass ;
+    doap:download-page "GrelFunctions.jar" ;
+    fnoi:class-name    "io.fno.grel.BooleanFunctions" .
+
+#AND
+
+grelm:andMapping
+    a                    fno:Mapping ;
+    fno:function         grel:boolean_and ;
+    fno:implementation   grelm:javaBoolean ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "and" ] ;
+.
+
+#OR
+
+grelm:orMapping
+    a                    fno:Mapping ;
+    fno:function         grel:boolean_or ;
+    fno:implementation   grelm:javaBoolean ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "or" ] ;
+.
+
+#NOT
+
+grelm:notMapping
+    a                    fno:Mapping ;
+    fno:function         grel:boolean_not ;
+    fno:implementation   grelm:javaBoolean ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "not" ] ;
+.
+
+#XOR
+
+grelm:xorMapping
+    a                    fno:Mapping ;
+    fno:function         grel:boolean_xor ;
+    fno:implementation   grelm:javaBoolean ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "xor" ] ;
+.
+
+grelm:javaControls
+    a                  fnoi:JavaClass ;
+    doap:download-page "GrelFunctions.jar" ;
+    fnoi:class-name    "io.fno.grel.ControlsFunctions" .
+
+#IFTHENELSE
+
+grelm:ifthenelseMapping
+    a                    fno:Mapping ;
+    fno:function         grel:controls_if ;
+    fno:implementation   grelm:javaControls ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "ifThenElse" ] ;
+.
+
+grelm:javaString
+    a                  fnoi:JavaClass ;
+    doap:download-page "GrelFunctions.jar" ;
+    fnoi:class-name    "io.fno.grel.StringFunctions" .
+
+#STRING_LENGTH
+
+grelm:lengthMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_length ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "length" ] ;
+.
+
+#STARTSWITH
+
+grelm:startsWithMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_startsWith ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "startsWith" ] ;
+.
+
+#ENDSWITH
+
+grelm:endsWithMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_endsWith ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "endsWith" ] ;
+.
+
+#CONTAINS
+
+grelm:containsMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_contains ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "contains" ] ;
+.
+
+#TOLOWERCASE
+
+grelm:lowercaseMapping
+    a                    fno:Mapping ;
+    fno:function         grel:toLowerCase ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "toLowercase" ] ;
+.
+
+#TOUPPERCASE
+
+grelm:uppercaseMapping
+    a                    fno:Mapping ;
+    fno:function         grel:toUpperCase ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "toUppercase" ] ;
+.
+
+#TRIM
+
+grelm:trimMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_trim ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "trim" ] ;
+.
+
+#CHOMP
+
+grelm:trimMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_chomp ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "chomp" ] ;
+.
+
+#SUBSTRING
+
+grelm:substringMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_substring ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "substring" ] ;
+.
+
+#SPLIT
+
+grelm:splitMapping
+    a                    fno:Mapping ;
+    fno:function         grel:string_split ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "split" ] ;
+.
+
+#ESCAPE
+
+grelm:escapeMapping
+    a                    fno:Mapping ;
+    fno:function         grel:escape ;
+    fno:implementation   grelm:javaString ;
+# TODO if not clear
+    fno:parameterMapping [ ] ;
+# TODO if not clear
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "escape" ] ;
+.
+
diff --git a/src/main/resources/idlab_java_mapping.ttl b/src/main/resources/idlab_java_mapping.ttl
new file mode 100644
index 00000000..ceb6343e
--- /dev/null
+++ b/src/main/resources/idlab_java_mapping.ttl
@@ -0,0 +1,125 @@
+@prefix cc:      <http://creativecommons.org/ns#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix doap:    <http://usefulinc.com/ns/doap#> .
+@prefix fno:     <https://w3id.org/function/ontology#> .
+@prefix fnoi:    <https://w3id.org/function/vocabulary/implementation#> .
+@prefix fnom:    <https://w3id.org/function/vocabulary/mapping#> .
+@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
+@prefix grel:    <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix grelm:   <http://fno.io/grel/rmlmapping#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix void:    <http://rdfs.org/ns/void#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+grelm:void
+    a                 void:DatasetDescription ;
+    dcterms:title     "A VoID Description of the IDLab Fno Java Mapping Descriptions Dataset" ;
+    dcterms:creator   <https://ben.de-meester.org/#me> ;
+    foaf:primaryTopic grelm:dataset ;
+.
+
+<https://ben.de-meester.org/#me>
+    rdf:type  foaf:Person ;
+    foaf:mbox "mailto:Ben.DeMeester@UGent.be" ;
+    foaf:name "Ben De Meester"@en .
+
+grelm:dataset
+    a                    void:Dataset ;
+    foaf:homepage        <https://github.com/OpenRefine/OpenRefine/wiki/General-Refine-Expression-Language> ;
+    foaf:homepage        <https://fno.io> ;
+    dcterms:title        "IDLab Fno Java Mapping Descriptions"@en ;
+    dcterms:description  "The FnO Java mapping descriptions of the IDLab functions" ;
+    dcterms:contributor  <https://ben.de-meester.org/#me> ;
+    dcterms:modified     "2020-06-16"^^xsd:date ;
+    cc:license           <http://creativecommons.org/license/by/3.0/> ;
+    dcterms:issued       "2020-06-16"^^xsd:date ;
+    dcterms:rights       "Copyright © Ghent University – imec – IDLab"@en ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_(mathematics)> ;
+    dcterms:subject      <http://dbpedia.org/resource/Function_model> ;
+    void:feature         <http://www.w3.org/ns/formats/Turtle> ;
+    void:exampleResource grelm:boolean_and ;
+    void:vocabulary      <https://w3id.org/function/ontology#>, <https://w3id.org/function/vocabulary/implementation#>,
+                         <https://w3id.org/function/vocabulary/mapping#> .
+
+# Contents:
+# - Parameters (per java) param_{var} with predicate p_{type}_{var}
+# - Outputs (per java) output_{type} with predicate o_{type}
+# - Problems (per java) prob_{var}
+#   - Functions (per java)
+
+################################
+####    IMPLEMENTATIONS
+################################
+grelm:IDLabFunctions
+    a                  fnoi:JavaClass ;
+    doap:download-page "IDLabFunctions.jar" ;
+    fnoi:class-name    "io.fno.idlab.IDLabFunctions" .
+
+################################
+####    MAPPINGS
+################################
+
+#UPPERCASERURL
+grelm:uppercaseURLMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:toUpperCaseURL;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "toUpperCaseURL" ] ;
+.
+
+grelm:trueConditionMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:trueCondition;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "trueCondition" ] ;
+.
+
+
+grelm:equalMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:equal;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "equal" ] ;
+.
+
+
+grelm:notEqualMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:notEqual;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "notEqual" ] ;
+.
+
+grelm:stringContainsOtherStringMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:stringContainsOtherString;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "stringContainsOtherString" ] ;
+.
+
+grelm:randomMapping
+    a                    fno:Mapping ;
+    fno:function         idlab-fn:random;
+    fno:implementation   grelm:IDLabFunctions ;
+    fno:parameterMapping [ ] ;
+    fno:returnMapping    [ ] ;
+    fno:methodMapping    [ a                fnom:StringMethodMapping ;
+                           fnom:method-name "random" ] ;
+.
+
diff --git a/src/main/resources/json_data_mapping.ttl b/src/main/resources/json_data_mapping.ttl
deleted file mode 100644
index e58d25dc..00000000
--- a/src/main/resources/json_data_mapping.ttl
+++ /dev/null
@@ -1,123 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-
-
-
-# LIJSTProducttype
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource [
-        rml:source "/home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/books_small.json";
-        rml:referenceFormulation ql:JSONPath;
-        rml:iterator "$.store.books"
-    ];
-
-    rr:subjectMap [
-        rml:reference "id";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "id";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-
-     rr:predicateObjectMap [
-                 rr:predicateMap [
-                     rr:constant dcterms:title;
-                     rr:termType rr:IRI
-                 ];
-                 rr:objectMap [
-                     rml:reference "id";
-                     rr:termType rr:Literal
-                 ]
-             ];
-
-
-             rr:predicateObjectMap [
-                         rr:predicateMap [
-                             rr:constant dcterms:title;
-                             rr:termType rr:IRI
-                         ];
-                         rr:objectMap [
-                             rml:reference "id";
-                             rr:termType rr:Literal
-                         ]
-                     ];
-
-
-
-
-                     rr:predicateObjectMap [
-                                 rr:predicateMap [
-                                     rr:constant dcterms:title;
-                                     rr:termType rr:IRI
-                                 ];
-                                 rr:objectMap [
-                                     rml:reference "id";
-                                     rr:termType rr:Literal
-                                 ]
-                             ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:title;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rr:template "test/{id}";
-            rr:termType rr:IRI
-        ]
-    ].
diff --git a/src/main/resources/json_join_data_mapping.ttl b/src/main/resources/json_join_data_mapping.ttl
deleted file mode 100644
index 5213b412..00000000
--- a/src/main/resources/json_join_data_mapping.ttl
+++ /dev/null
@@ -1,96 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-
-
-
-# LIJSTProducttype
-
- <#LogicalSource>
-    a rml:LogicalSource;
-    rml:source "file:///home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/books.json";
-    rml:iterator "id" ;
-    rml:referenceFormulation ql:JSONPath.
-
- <#LogicalSource_2>
-     a rml:LogicalSource;
-     rml:source "file:///home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/books.json";
-     rml:iterator "id" ;
-     rml:referenceFormulation ql:JSONPath.
-
- <#LIJSTProducttype_only_subject>
-
-     a rr:TriplesMap;
-     rml:logicalSource <#LogicalSource>;
-
-     rr:subjectMap [
-         rr:template "https://io.rml.airports/{id}";
-         rr:termType rr:IRI;
-         rr:class skos:Concept
-     ].
-
-
- <#ParentTriplesMap>
-    a rr:TriplesMap;
-    rml:logicalSource <#LogicalSource_2>;
-    rr:subjectMap [
-        rr:template "https://io.rml.airports/parent/{id}";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ].
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource <#LogicalSource>;
-
-    rr:subjectMap [
-        rml:reference "id";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "id";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:parent;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rr:parentTriplesMap <#ParentTriplesMap>;
-                    rr:joinCondition [
-                        rr:parent "id" ;
-                        rr:child "id"
-                    ];
-                    rr:termType rr:IRI
-                ]
-            ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:city;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rml:reference "id";
-            rr:termType rr:Literal
-        ]
-    ].
diff --git a/src/main/resources/json_stream_data_mapping.ttl b/src/main/resources/json_stream_data_mapping.ttl
deleted file mode 100644
index 8a0d4739..00000000
--- a/src/main/resources/json_stream_data_mapping.ttl
+++ /dev/null
@@ -1,129 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix rmls:    <http://semweb.mmlab.be/ns/rmls#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-
-
-# LIJSTProducttype
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource [
-        rml:source [
-            rdf:type rmls:TCPSocketStream ;
-            rmls:hostName "localhost";
-            rmls:type "PULL"; 
-            rmls:port "5005"
-        ];
-        rml:referenceFormulation ql:JSONPath;
-    ];
-
-    rr:subjectMap [
-        rml:reference "$.id";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "$.id";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "$.id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "$.id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "$.id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-
-     rr:predicateObjectMap [
-                 rr:predicateMap [
-                     rr:constant dcterms:title;
-                     rr:termType rr:IRI
-                 ];
-                 rr:objectMap [
-                     rml:reference "$.id";
-                     rr:termType rr:Literal
-                 ]
-             ];
-
-
-             rr:predicateObjectMap [
-                         rr:predicateMap [
-                             rr:constant dcterms:title;
-                             rr:termType rr:IRI
-                         ];
-                         rr:objectMap [
-                             rml:reference "$.id";
-                             rr:termType rr:Literal
-                         ]
-                     ];
-
-
-
-
-                     rr:predicateObjectMap [
-                                 rr:predicateMap [
-                                     rr:constant dcterms:title;
-                                     rr:termType rr:IRI
-                                 ];
-                                 rr:objectMap [
-                                     rml:reference "$.id";
-                                     rr:termType rr:Literal
-                                 ]
-                             ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:title;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rr:template "test/{$.id}";
-            rr:termType rr:IRI
-        ]
-    ].
diff --git a/src/main/resources/json_stream_file_mapping.ttl b/src/main/resources/json_stream_file_mapping.ttl
deleted file mode 100644
index e4fc428e..00000000
--- a/src/main/resources/json_stream_file_mapping.ttl
+++ /dev/null
@@ -1,128 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix rmls:    <http://semweb.mmlab.be/ns/rmls#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-
-
-# LIJSTProducttype
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource [
-        rml:source [
-            rdf:type rmls:FileStream;
-            rmls:path "/home/wmaroy/github/rml-framework/akka-pipeline/src/main/resources/io/rml/framework/data/books.json"
-        ];
-        rml:referenceFormulation ql:JSONPath;
-        rml:iterator "$.store.books[*]"
-    ];
-
-    rr:subjectMap [
-        rr:template "{$.id}" ;
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "$.id";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "$.id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "$.id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:title;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rml:reference "$.id";
-                    rr:termType rr:Literal
-                ]
-            ];
-
-
-     rr:predicateObjectMap [
-                 rr:predicateMap [
-                     rr:constant dcterms:title;
-                     rr:termType rr:IRI
-                 ];
-                 rr:objectMap [
-                     rml:reference "$.id";
-                     rr:termType rr:Literal
-                 ]
-             ];
-
-
-             rr:predicateObjectMap [
-                         rr:predicateMap [
-                             rr:constant dcterms:title;
-                             rr:termType rr:IRI
-                         ];
-                         rr:objectMap [
-                             rml:reference "$.id";
-                             rr:termType rr:Literal
-                         ]
-                     ];
-
-
-
-
-                     rr:predicateObjectMap [
-                                 rr:predicateMap [
-                                     rr:constant dcterms:title;
-                                     rr:termType rr:IRI
-                                 ];
-                                 rr:objectMap [
-                                     rml:reference "$.id";
-                                     rr:termType rr:Literal
-                                 ]
-                             ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:title;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rr:template "{$.id}";
-            rr:termType rr:IRI
-        ]
-    ].
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 20495214..dace706e 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,5 +1,12 @@
 
-log4j.rootLogger=INFO, console
+log4j.rootLogger=WARN, console
+log4j.logger.io.rml=DEBUG
+log4j.logger.org.apache.flink=WARN
+log4j.logger.kafka=ERROR
+log4j.logger.org.I0Itec.zkclient=ERROR
+log4j.logger.org.apache.kafka=ERROR
+log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.curator=ERROR
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
diff --git a/src/main/resources/xml_data_mapping.ttl b/src/main/resources/xml_data_mapping.ttl
deleted file mode 100644
index d18736d2..00000000
--- a/src/main/resources/xml_data_mapping.ttl
+++ /dev/null
@@ -1,52 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-
-
-
-# LIJSTProducttype
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource [
-        rml:source "/home/wmaroy/Downloads/standard";
-        rml:referenceFormulation ql:XPath;
-        rml:iterator "/site/regions/africa/item"
-    ];
-
-    rr:subjectMap [
-        rml:reference "/item/name";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "/item/location";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:title;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rr:template "test/{/item/location}";
-            rr:termType rr:IRI
-        ]
-    ].
diff --git a/src/main/resources/xml_join_data_mapping.ttl b/src/main/resources/xml_join_data_mapping.ttl
deleted file mode 100644
index a5653faa..00000000
--- a/src/main/resources/xml_join_data_mapping.ttl
+++ /dev/null
@@ -1,96 +0,0 @@
-@prefix rr:     <http://www.w3.org/ns/r2rml#>.
-@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@prefix oslo:   <http://purl.org/oslo/ns/localgov#>.
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
-@prefix vcard:  <http://www.w3.org/2006/vcard/ns#> .
-@prefix dcterms:<http://purl.org/dc/terms/> .
-@prefix adms:   <http://www.w3.org/ns/adms#>.
-@prefix locn:   <http://www.w3.org/ns/locn#>.
-
-
-
-# LIJSTProducttype
-
- <#LogicalSource>
-    a rml:LogicalSource;
-    rml:source "/home/wmaroy/Downloads/standard";
-            rml:referenceFormulation ql:XPath;
-            rml:iterator "/site/regions/africa/item".
-
- <#LogicalSource_2>
-     a rml:LogicalSource;
-     rml:source "/home/wmaroy/Downloads/standard";
-             rml:referenceFormulation ql:XPath;
-             rml:iterator "/site/regions/africa/item".
-
- <#LIJSTProducttype_only_subject>
-
-     a rr:TriplesMap;
-     rml:logicalSource <#LogicalSource>;
-
-     rr:subjectMap [
-         rr:template "https://io.rml.airports/{/item/name}";
-         rr:termType rr:IRI;
-         rr:class skos:Concept
-     ].
-
-
- <#ParentTriplesMap>
-    a rr:TriplesMap;
-    rml:logicalSource <#LogicalSource_2>;
-    rr:subjectMap [
-        rr:template "https://io.rml.airports/parent/{/item/location}";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ].
-
- <#LIJSTProducttype>
-
-    a rr:TriplesMap;
-    rml:logicalSource <#LogicalSource>;
-
-    rr:subjectMap [
-        rml:reference "/item/name";
-        rr:termType rr:IRI;
-        rr:class skos:Concept
-    ];
-
-    rr:predicateObjectMap [
-            rr:predicateMap [
-                rr:constant dcterms:title;
-                rr:termType rr:IRI
-            ];
-            rr:objectMap [
-                rml:reference "/item/name";
-                rr:termType rr:Literal
-            ]
-        ];
-
-    rr:predicateObjectMap [
-                rr:predicateMap [
-                    rr:constant dcterms:parent;
-                    rr:termType rr:IRI
-                ];
-                rr:objectMap [
-                    rr:parentTriplesMap <#ParentTriplesMap>;
-                    rr:joinCondition [
-                        rr:parent "/item/name" ;
-                        rr:child "/item/name"
-                    ];
-                    rr:termType rr:IRI
-                ]
-            ];
-
-    rr:predicateObjectMap [
-        rr:predicateMap [
-            rr:constant dcterms:city;
-            rr:termType rr:IRI
-        ];
-        rr:objectMap [
-            rml:reference "/item/name";
-            rr:termType rr:Literal
-        ]
-    ].
diff --git a/src/main/scala/io/rml/framework/Main.scala b/src/main/scala/io/rml/framework/Main.scala
index 2163d029..5782e2f5 100644
--- a/src/main/scala/io/rml/framework/Main.scala
+++ b/src/main/scala/io/rml/framework/Main.scala
@@ -26,9 +26,9 @@ package io.rml.framework
   **/
 
 
-import java.util.Properties
-
-import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.api.{FnOEnvironment, RMLEnvironment}
+import io.rml.framework.core.extractors.TriplesMapsCache
+import io.rml.framework.core.function.flink.{FnOEnvironmentLoader, FnOEnvironmentStreamLoader, RichItemIdentityFunction, RichStreamItemIdentityFunction}
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model._
 import io.rml.framework.core.util.{StreamerConfig, Util}
@@ -39,14 +39,19 @@ import io.rml.framework.flink.item.{Item, JoinedItem}
 import io.rml.framework.flink.source.{EmptyItem, FileDataSet, Source}
 import io.rml.framework.flink.util.ParameterUtil
 import io.rml.framework.flink.util.ParameterUtil.{OutputSinkOption, PostProcessorOption}
-import org.apache.flink.api.common.serialization.SimpleStringSchema
+import org.apache.flink.api.common.serialization.{SimpleStringEncoder, SimpleStringSchema}
 import org.apache.flink.api.scala._
 import org.apache.flink.core.fs.FileSystem.WriteMode
+import org.apache.flink.core.fs.Path
 import org.apache.flink.streaming.api.CheckpointingMode
 import org.apache.flink.streaming.api.functions.ProcessFunction
+import org.apache.flink.streaming.api.functions.sink.filesystem.bucketassigners.BasePathBucketAssigner
+import org.apache.flink.streaming.api.functions.sink.filesystem.rollingpolicies.OnCheckpointRollingPolicy
+import org.apache.flink.streaming.api.functions.sink.filesystem.{OutputFileConfig, StreamingFileSink}
 import org.apache.flink.streaming.api.scala.{DataStream, OutputTag, StreamExecutionEnvironment}
 import org.apache.flink.util.Collector
 
+import java.util.Properties
 import scala.collection.{immutable, mutable}
 
 /**
@@ -82,19 +87,29 @@ object Main extends Logging {
     // determine the base IRI of the RDF to generate
     RMLEnvironment.setGeneratorBaseIRI(config.baseIRI)
 
-    // determine the base IRI of the mapping file
-    RMLEnvironment.setMappingFileBaseIRI(Some((config.mappingFilePath)))
-
     // Read mapping file and format these, a formatted mapping is a rml mapping that is reorganized optimally.
     // Triple maps are also organized in categories (does it contain streams, does it contain joins, ... )
     val formattedMapping = Util.readMappingFile(config.mappingFilePath)
 
+
+    // Default function config
+    // TODO: support adding variable function related files using CLI arguments
+    FnOEnvironment.loadDefaultConfiguration()
+    FnOEnvironment.intializeFunctionLoader()
+
+
+
     // set up execution environments, Flink needs these to know how to operate (local, cluster mode, ...)
     implicit val env = ExecutionEnvironment.getExecutionEnvironment
     implicit val senv = StreamExecutionEnvironment.getExecutionEnvironment
 
+
     if (config.checkpointInterval.isDefined) {
       senv.enableCheckpointing(config.checkpointInterval.get, CheckpointingMode.AT_LEAST_ONCE); // This is what Kafka supports ATM, see https://ci.apache.org/projects/flink/flink-docs-release-1.8/dev/connectors/guarantees.html
+
+      // in order for the StreamingFileSink to work correctly, checkpointing needs to be enabled
+    } else if (config.outputSink.equals(OutputSinkOption.File) && formattedMapping.containsStreamTriplesMaps()) {
+      senv.enableCheckpointing(30000, CheckpointingMode.AT_LEAST_ONCE);
     }
 
     if (formattedMapping.containsDatasetTriplesMaps() && !formattedMapping.containsStreamTriplesMaps()) {
@@ -143,7 +158,24 @@ object Main extends Logging {
       }
       // write to a file if the parameter is given
       else if (config.outputSink.equals(OutputSinkOption.File)) {
-        stream.writeAsText(config.outputPath.get, WriteMode.OVERWRITE)
+        val parts = config.outputPath.get.split('.')
+        val path = parts(0)
+        val suffix =
+          if (parts.length > 1) {
+            "." ++ parts.slice(1, parts.length).mkString(".")
+          } else {
+            if (config.postProcessor.equals(PostProcessorOption.JsonLD)) ".json" else ".nq"
+          }
+        val sink: StreamingFileSink[String] = StreamingFileSink
+          .forRowFormat(new Path(path), new SimpleStringEncoder[String]("UTF-8"))
+          .withBucketAssigner(new BasePathBucketAssigner[String])
+          .withRollingPolicy(OnCheckpointRollingPolicy.build())
+          .withOutputFileConfig(OutputFileConfig
+            .builder()
+            .withPartSuffix(suffix)
+            .build())
+          .build()
+        stream.addSink(sink).name("Streaming file sink")
       }
       // discard output if the parameter is given
       else if (config.outputSink.equals(OutputSinkOption.None)) {
@@ -193,6 +225,17 @@ object Main extends Logging {
       }
     })
 
+    val preProcessingFunction =
+      if(FnOEnvironment.getFunctionLoader.isDefined){
+        val functionLoaderOption = FnOEnvironment.getFunctionLoader
+        val jarSources = functionLoaderOption.get.getSources
+        val classNames = functionLoaderOption.get.getClassNames
+        new FnOEnvironmentStreamLoader(jarSources , classNames)
+      }else {
+        logInfo("FunctionLoader in RMLEnvironment is NOT DEFINED")
+        new RichStreamItemIdentityFunction()
+      }
+
     // This is the collection of all data streams that are created by the current mapping
     val processedStreams: immutable.Iterable[DataStream[String]] =
       sourceEngineMap.map(entry => {
@@ -201,6 +244,8 @@ object Main extends Logging {
         // link the different steps in each pipeline
         source.stream // this will generate a stream of items
           // process every item by a processor with a loaded engine
+
+          .map(preProcessingFunction)
           .map(new StdStreamProcessor(engine))
           .name("Execute mapping statements on items")
 
@@ -222,7 +267,7 @@ object Main extends Logging {
 
   }
 
-  def createMixedPipelineFromFormattedMapping(formattedMapping: FormattedRMLMapping)(implicit env: ExecutionEnvironment, senv: StreamExecutionEnvironment, postProcessor: PostProcessor): DataStream[String] = {
+  private def createMixedPipelineFromFormattedMapping(formattedMapping: FormattedRMLMapping)(implicit env: ExecutionEnvironment, senv: StreamExecutionEnvironment, postProcessor: PostProcessor): DataStream[String] = {
     // we assume a streaming child triples map and a static parent triples map
     require(formattedMapping.containsStreamTriplesMaps() && formattedMapping.containsDatasetTriplesMaps() && formattedMapping.containsParentTriplesMaps)
 
@@ -275,7 +320,7 @@ object Main extends Logging {
         val joinedStreamTm = triplesMap.asInstanceOf[JoinedTriplesMap]
         val engine = StatementEngine.fromJoinedTriplesMap(joinedStreamTm)
 
-        val parentTmId = joinedStreamTm.parentTriplesMap.identifier
+        val parentTmId = joinedStreamTm.parentTriplesMap
         val joinParentSource = joinedStreamTm.joinCondition.get.parent.identifier
         stream
           .flatMap(_.iterator)
@@ -323,20 +368,20 @@ object Main extends Logging {
     unionStreams(processedDataStreams)
   }
 
-  def getStaticParentSourceItems(formattedMapping: FormattedRMLMapping)(implicit env: ExecutionEnvironment, senv: StreamExecutionEnvironment, postProcessor: PostProcessor)
+  private def getStaticParentSourceItems(formattedMapping: FormattedRMLMapping)(implicit env: ExecutionEnvironment, senv: StreamExecutionEnvironment, postProcessor: PostProcessor)
   : Map[(String, String, String), Item] = {
     // map: (parent triples map identiefier, name of the variable to join on, the value of it) => generated subject string
     var parentTriplesMapId2JoinParentSource2JoinParentValue2ParentItem = mutable.HashMap.empty[(String, String, String), Item]
 
     formattedMapping.joinedSteamTriplesMaps.foreach(joinedTm => {
       // identify the parent triples map
-      val parentTm = joinedTm.parentTriplesMap
+      val parentTm = TriplesMapsCache.get(joinedTm.parentTriplesMap).get;
 
       // find the parent source of the join condition
       val joinParentSource = joinedTm.joinCondition.get.parent.identifier
 
       // get the subjects from the static logical source
-      val parentDataset = Source(joinedTm.parentTriplesMap.logicalSource).asInstanceOf[FileDataSet].dataset
+      val parentDataset = Source(parentTm.logicalSource).asInstanceOf[FileDataSet].dataset
 
       parentDataset
         // only keep items where the parent source of the join condition is defined
@@ -374,6 +419,7 @@ object Main extends Logging {
                                         senv: StreamExecutionEnvironment,
                                         postProcessor: PostProcessor): DataSet[String] = {
 
+    this.logDebug("createDataSetFromFormattedMapping(...)")
     require(!postProcessor.isInstanceOf[AtMostOneProcessor], "Bulk output and JSON-LD output are not supported in the static version")
 
     /**
@@ -419,7 +465,7 @@ object Main extends Logging {
                                              (implicit env: ExecutionEnvironment,
                                               senv: StreamExecutionEnvironment,
                                               postProcessor: PostProcessor): DataSet[String] = {
-
+    this.logDebug("createStandardTriplesMapPipeline(standard triples maps..)")
     // group triple maps by logical sources
     val grouped = standardTriplesMaps.groupBy(triplesMap => triplesMap.logicalSource)
 
@@ -435,6 +481,17 @@ object Main extends Logging {
       }
     })
 
+    val preProcessingFunction =
+    if(FnOEnvironment.getFunctionLoader.isDefined){
+      val functionLoaderOption = FnOEnvironment.getFunctionLoader
+      val jarSources = functionLoaderOption.get.getSources
+      val classNames = functionLoaderOption.get.getClassNames
+      new FnOEnvironmentLoader(jarSources , classNames)
+    }else {
+      logInfo("FunctionLoader in RMLEnvironment is NOT DEFINED")
+      new RichItemIdentityFunction()
+    }
+
     // This is the collection of all data streams that are created by the current mapping
     val processedDataSets: immutable.Iterable[DataSet[String]] =
       sourceEngineMap.map(entry => {
@@ -444,6 +501,7 @@ object Main extends Logging {
         source.dataset // this will generate a dataset of items
 
           // process every item by a processor with a loaded engine
+            .map(preProcessingFunction)
           .map(new StdStaticProcessor(engine))
           .name("Execute mapping statements on items")
 
@@ -488,9 +546,10 @@ object Main extends Logging {
         })
 
 
+      val parentTriplesMap = TriplesMapsCache.get(tm.parentTriplesMap).get;
       val parentDataset =
       // Create a Source from the parents logical source
-        Source(tm.parentTriplesMap.logicalSource).asInstanceOf[FileDataSet]
+        Source(parentTriplesMap.logicalSource).asInstanceOf[FileDataSet]
           .dataset
 
           // filter out all items that do not contain the parents join condition
@@ -537,7 +596,9 @@ object Main extends Logging {
         // create a crossed data set
         val crossed = childDataset.cross(parentDataset)
 
-        crossed.map(items => JoinedItem(items._1, items._2)) // create a JoinedItem from the crossed items
+        crossed.map(items =>
+          JoinedItem(items._1, items._2)
+        ) // create a JoinedItem from the crossed items
           .map(new JoinedStaticProcessor(engine)).name("Execute mapping statements on joined items") // process the joined items
           .flatMap(list => if (list.nonEmpty) Some(list.reduce((a, b) => a + "\n" + b)) else None) // format the triples
           .name("Convert joined triples to strings")
@@ -582,4 +643,6 @@ object Main extends Logging {
   }
 
 
+
+
 }
diff --git a/src/main/scala/io/rml/framework/api/FnOEnvironment.scala b/src/main/scala/io/rml/framework/api/FnOEnvironment.scala
new file mode 100644
index 00000000..26409ac7
--- /dev/null
+++ b/src/main/scala/io/rml/framework/api/FnOEnvironment.scala
@@ -0,0 +1,94 @@
+package io.rml.framework.api
+
+import io.rml.framework.core.function.FunctionLoader
+import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.util.Util
+
+import scala.collection.mutable
+import scala.reflect.io.Path
+
+object FnOEnvironment extends Logging{
+  private val functionDescriptionFilePaths : mutable.MutableList[Path] = mutable.MutableList()
+  private val functionMappingFilePaths : mutable.MutableList[Path] = mutable.MutableList()
+  private var functionLoader : Option[FunctionLoader] = None
+  val loadedClassesMap : scala.collection.mutable.Map[String, Class[_]] = scala.collection.mutable.Map()
+
+  def getFunctionDescriptionFilePaths() = {
+    this.functionDescriptionFilePaths.toList
+  }
+  def addFunctionDescriptionFilePath(path : Path) : Unit = {
+    this.functionDescriptionFilePaths += path
+  }
+
+  def getFunctionMappingFilePaths() = {
+    this.functionMappingFilePaths.toList
+  }
+  def addFunctionMappingFilePaths(path : Path): Unit = {
+    this.functionMappingFilePaths += path
+  }
+
+  def intializeFunctionLoader() = {
+    this.functionLoader = FunctionLoader.apply(getFunctionDescriptionFilePaths(), getFunctionMappingFilePaths())
+    this.functionLoader
+  }
+  def getFunctionLoader: Option[FunctionLoader] = {
+    this.functionLoader
+  }
+
+  /**
+   * Default FnO Configuration.
+   * Function descriptions:
+   *  - functions_grel.ttl
+   *  - functions_idlab.ttl
+   * Function mappings
+   * - grel_java_mapping.ttl
+   * - idlab_java_mapping.ttl
+   *
+   * RMLStreamer will look for these files in directory where the RMLStreamer is executed from.
+   * Note: make sure to add jars with custom functions to Flink's `/lib` directory.
+   */
+  def loadDefaultConfiguration() = {
+
+    val defaultFunctionDescriptionFilePaths = List(
+      "./functions_grel.ttl",
+      "./functions_idlab.ttl"
+    )
+
+    val defaultFunctionMappingFilePaths = List(
+      "./grel_java_mapping.ttl",
+      "./idlab_java_mapping.ttl"
+    )
+
+    // adding default function description file paths to the RMLEnvironment
+    defaultFunctionDescriptionFilePaths.foreach(strPath=> {
+      try
+        {
+          val file = Util.getFile(strPath);
+          if (file.exists()) {
+            val p = Path.string2path(file.getAbsolutePath)
+            FnOEnvironment.addFunctionDescriptionFilePath(p)
+          } else {
+            logWarning(s"Can't add function description file to RMLEnvironment ( $strPath ). This will result in errors when using functions!");
+          }
+        }
+      catch {
+        case e : Exception => logWarning(s"Can't add function description file to RMLEnvironment ( $strPath ). This will result in errors when using functions! Exception: ${e.getMessage}")
+      }
+    })
+
+    // adding default function description file paths to the RMLEnvironment
+    defaultFunctionMappingFilePaths.foreach(strPath=> {
+      try {
+        val file = Util.getFile(strPath);
+        if (file.exists()) {
+          val p = Path.string2path(file.getAbsolutePath)
+          FnOEnvironment.addFunctionMappingFilePaths(p)
+        } else {
+          logWarning(s"Can't add function mapping file to RMLEnvironment ( $strPath ). This will result in errors when using functions!");
+        }
+      }catch {
+        case e : Exception => logWarning(s"Can't add function mapping file to RMLEnvironment ( $strPath ). This will result in errors when using functions! Exception: ${e.getMessage}")
+      }
+    })
+  }
+}
diff --git a/src/main/scala/io/rml/framework/api/RMLEnvironment.scala b/src/main/scala/io/rml/framework/api/RMLEnvironment.scala
index 92cc24c8..dc19a5b6 100644
--- a/src/main/scala/io/rml/framework/api/RMLEnvironment.scala
+++ b/src/main/scala/io/rml/framework/api/RMLEnvironment.scala
@@ -24,19 +24,7 @@
   **/
 package io.rml.framework.api
 
-import java.io.File
-
-import io.rml.framework.core.extractors.MappingReader
-import io.rml.framework.core.model.{FormattedRMLMapping, RMLMapping, Uri}
-import io.rml.framework.engine.Transformation
-import io.rml.framework.flink.item.Item
-
-import scala.collection.mutable.{Map => MutableMap}
-
 object RMLEnvironment {
-
-  private val transformations: MutableMap[Uri, Transformation] = MutableMap()
-  private val sources: MutableMap[Uri, Iterable[Item]] = MutableMap()
   private var generatorBaseIRI: Option[String] = None
   private var mappingFileBaseIRI: Option[String] = None
 
@@ -55,40 +43,4 @@ object RMLEnvironment {
   def getMappingFileBaseIRI(): Option[String] = {
     mappingFileBaseIRI
   }
-
-  def loadMappingFromFile(path: String): RMLMapping = {
-    val file = new File(path)
-    FormattedRMLMapping.fromRMLMapping(MappingReader().read(file))
-  }
-
-  def executeMapping(): Unit = ???
-
-  def executeTriplesMap(): Unit = ???
-
-  def registerTransformation(transformation: Transformation): Unit = {
-    transformations.put(transformation.name, transformation)
-  }
-
-  def registerSource(uri: Uri, iterable: Iterable[Item]): Unit = {
-    require(sources.isEmpty, "Processing of only one source supported in API mode.")
-    sources.put(uri, iterable)
-  }
-
-  def getSource(uri: Uri): Option[Iterable[Item]] = {
-    sources.get(uri)
-  }
-
-  def getTransformation(uri: Uri): Option[Transformation] = {
-    transformations.get(uri)
-  }
-
-  def hasTransformationRegistered(uri: Uri): Boolean = {
-    transformations.contains(uri)
-  }
-
-  def reset(): Unit = {
-    sources.clear()
-    transformations.clear()
-  }
-
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/Extractor.scala b/src/main/scala/io/rml/framework/core/extractors/Extractor.scala
index 0e78bea2..2d7fa16b 100644
--- a/src/main/scala/io/rml/framework/core/extractors/Extractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/Extractor.scala
@@ -34,7 +34,7 @@ import io.rml.framework.shared.RMLException
   * @tparam T RDFNode to extract from.
   * @tparam R Return type of extract.
   */
-trait Extractor[T <: RDFNode, R] {
+trait Extractor[T <: RDFNode, +R] {
 
   /**
     * Extract.
diff --git a/src/main/scala/io/rml/framework/core/extractors/FunctionMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/FunctionMapExtractor.scala
index 90b84472..c9349066 100644
--- a/src/main/scala/io/rml/framework/core/extractors/FunctionMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/FunctionMapExtractor.scala
@@ -24,47 +24,30 @@
   **/
 package io.rml.framework.core.extractors
 
-import io.rml.framework.core.model.rdf.{RDFLiteral, RDFResource}
-import io.rml.framework.core.model.{FunctionMap, Uri}
-import io.rml.framework.core.vocabulary.RMLVoc
-import io.rml.framework.shared.RMLException
+import io.rml.framework.core.extractors.std.{StdFunctionMapExtractor, TermMapExtractor}
+import io.rml.framework.core.model.FunctionMap
+import io.rml.framework.core.model.rdf.RDFResource
 
-case class FunctionMapExtractor() extends ResourceExtractor[List[FunctionMap]] {
+trait FunctionMapExtractor extends TermMapExtractor[List[FunctionMap]] {
+  /**
+   * Extract.
+   *
+   * @param node Node to extract from.
+   * @return
+   */
+  override def extract(node: RDFResource): List[FunctionMap]
 
-  lazy val triplesMapExtractor: TriplesMapExtractor = TriplesMapExtractor()
 
-  /**
-    * Extract.
-    *
-    * @param node Node to extract from.
-    * @return
-    */
-  override def extract(node: RDFResource): List[FunctionMap] = {
-    val properties = node.listProperties(RMLVoc.Property.OBJECTMAP)
-    properties.flatMap {
-      case literal: RDFLiteral =>
-        throw new RMLException(literal.toString +
-          ": A literal cannot be converted to a predicate object map")
+}
 
-      case resource: RDFResource =>
-        resource.getType match {
-          case Some(Uri(RMLVoc.Class.FUNCTIONTERMMAP)) => Some(extractFunctionMap(resource))
-          case _ => None
-        }
 
-    }
-  }
 
-  private def extractFunctionMap(resource: RDFResource): FunctionMap = {
-    val functionValues = resource.listProperties(RMLVoc.Property.FUNCTIONVALUE)
+object FunctionMapExtractor {
 
-    require(functionValues.size == 1, "Only 1 function value allowed.")
-    require(functionValues.head.isInstanceOf[RDFResource], "FunctionValue must be a resource.")
 
-    val functionValue = functionValues.head.asInstanceOf[RDFResource]
-    val triplesMap = triplesMapExtractor.extractTriplesMapProperties(functionValue)
-    require(triplesMap.isDefined)
-    FunctionMap(functionValue.uri.toString, triplesMap.get)
-  }
+  def apply():FunctionMapExtractor = {
 
+    new StdFunctionMapExtractor()
+  }
 }
+
diff --git a/src/main/scala/io/rml/framework/core/extractors/GraphExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/GraphExtractor.scala
index 6b5b7c23..18765f1a 100644
--- a/src/main/scala/io/rml/framework/core/extractors/GraphExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/GraphExtractor.scala
@@ -27,4 +27,4 @@ package io.rml.framework.core.extractors
 
 import io.rml.framework.core.model.rdf.RDFGraph
 
-trait GraphExtractor[T] extends Extractor[RDFGraph, T]
+trait GraphExtractor[+T] extends Extractor[RDFGraph, T]
diff --git a/src/main/scala/io/rml/framework/core/extractors/LogicalSourceExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/LogicalSourceExtractor.scala
index 8ce66220..1d86ee73 100644
--- a/src/main/scala/io/rml/framework/core/extractors/LogicalSourceExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/LogicalSourceExtractor.scala
@@ -33,9 +33,9 @@ trait LogicalSourceExtractor extends ResourceExtractor[LogicalSource]
 object LogicalSourceExtractor {
 
 
-  def apply(dataSourceExtractor: DataSourceExtractor = DataSourceExtractor())
+  def apply()
   : LogicalSourceExtractor = {
-    lazy val extractor = new StdLogicalSourceExtractor(dataSourceExtractor)
+    lazy val extractor = new StdLogicalSourceExtractor(DataSourceExtractor())
     extractor
   }
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/MappingExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/MappingExtractor.scala
index 474cddf9..8cc44527 100644
--- a/src/main/scala/io/rml/framework/core/extractors/MappingExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/MappingExtractor.scala
@@ -26,10 +26,10 @@
 package io.rml.framework.core.extractors
 
 import io.rml.framework.core.extractors.std.StdMappingExtractor
-import io.rml.framework.core.model.RMLMapping
+import io.rml.framework.core.model.{Graph, RMLMapping}
 
-trait MappingExtractor extends GraphExtractor[RMLMapping]
+trait MappingExtractor [+T<: Graph]extends GraphExtractor[T]
 
 object MappingExtractor {
-  def apply(): MappingExtractor = new StdMappingExtractor()
+  def apply(): MappingExtractor[RMLMapping] = new StdMappingExtractor()
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/MappingReader.scala b/src/main/scala/io/rml/framework/core/extractors/MappingReader.scala
index d6eafd35..5cc03892 100644
--- a/src/main/scala/io/rml/framework/core/extractors/MappingReader.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/MappingReader.scala
@@ -25,16 +25,16 @@
 
 package io.rml.framework.core.extractors
 
-import java.io.File
-
 import io.rml.framework.core.extractors.std.StdMappingReader
-import io.rml.framework.core.model.{RMLMapping, Uri}
+import io.rml.framework.core.model.{Graph, Uri}
 import io.rml.framework.shared.ReadException
 
+import java.io.File
+
 /**
   * This trait defines interfaces for reading RML mappings from file or from in-memory strings.
   */
-trait MappingReader {
+trait MappingReader[+OUT] {
 
   /**
     * Reads a file and converts it to an RMLMapping.
@@ -44,7 +44,7 @@ trait MappingReader {
     * @return
     */
   @throws(classOf[ReadException])
-  def read(file: File): RMLMapping
+  def read(file: File): OUT
 
   /**
     * Reads a dump and converts it to an RMLMapping
@@ -55,7 +55,7 @@ trait MappingReader {
     * @return
     */
   @throws(classOf[ReadException])
-  def read(dump: String, graphUri: Uri): RMLMapping
+  def read(dump: String, graphUri: Uri): OUT
 
 }
 
@@ -63,12 +63,12 @@ trait MappingReader {
   * Object with factory apply method for MappingReader.
   */
 object MappingReader {
-
-  def apply(mappingExtractor: MappingExtractor = MappingExtractor()): MappingReader = {
+  def apply(mappingExtractor: MappingExtractor[Graph] = MappingExtractor()) = {
     lazy val reader = new StdMappingReader(mappingExtractor)
     reader
   }
 
+
 }
 
 
diff --git a/src/main/scala/io/rml/framework/core/extractors/ObjectMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/ObjectMapExtractor.scala
index 2f3e0871..322c2d40 100644
--- a/src/main/scala/io/rml/framework/core/extractors/ObjectMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/ObjectMapExtractor.scala
@@ -30,5 +30,5 @@ import io.rml.framework.core.model.ObjectMap
 trait ObjectMapExtractor extends TermMapExtractor[List[ObjectMap]]
 
 object ObjectMapExtractor {
-  def apply(): ObjectMapExtractor = new StdObjectMapExtractor
+  def apply(): ObjectMapExtractor = new StdObjectMapExtractor()
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/PredicateMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/PredicateMapExtractor.scala
index 93e07d40..bb4569b9 100644
--- a/src/main/scala/io/rml/framework/core/extractors/PredicateMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/PredicateMapExtractor.scala
@@ -31,7 +31,7 @@ import io.rml.framework.core.model.PredicateMap
 trait PredicateMapExtractor extends TermMapExtractor[List[PredicateMap]]
 
 object PredicateMapExtractor {
-  def apply(): PredicateMapExtractor = new StdPredicateMapExtractor()
+  def apply(): PredicateMapExtractor  = new StdPredicateMapExtractor()
 }
 
 
diff --git a/src/main/scala/io/rml/framework/core/extractors/PredicateObjectMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/PredicateObjectMapExtractor.scala
index c0de58a4..22b540d4 100644
--- a/src/main/scala/io/rml/framework/core/extractors/PredicateObjectMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/PredicateObjectMapExtractor.scala
@@ -31,11 +31,8 @@ import io.rml.framework.core.model.PredicateObjectMap
 trait PredicateObjectMapExtractor extends ResourceExtractor[List[PredicateObjectMap]]
 
 object PredicateObjectMapExtractor {
-  def apply(objectMapExtractor: ObjectMapExtractor = ObjectMapExtractor(),
-            predicateMapExtractor: PredicateMapExtractor = PredicateMapExtractor(),
-            functionMapExtractor: FunctionMapExtractor = FunctionMapExtractor(),
-            graphMapExtractor: GraphMapExtractor = GraphMapExtractor())
+  def apply()
 
   : PredicateObjectMapExtractor =
-    new StdPredicateObjectMapExtractor(predicateMapExtractor, objectMapExtractor, functionMapExtractor, graphMapExtractor)
+    new StdPredicateObjectMapExtractor()
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/ResourceExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/ResourceExtractor.scala
index 2ffee8d4..a62635f2 100644
--- a/src/main/scala/io/rml/framework/core/extractors/ResourceExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/ResourceExtractor.scala
@@ -25,6 +25,6 @@
 
 package io.rml.framework.core.extractors
 
+import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model.rdf.RDFResource
-
-trait ResourceExtractor[T] extends Extractor[RDFResource, T]
+trait ResourceExtractor[T] extends Extractor[RDFResource, T] with Logging
diff --git a/src/main/scala/io/rml/framework/core/extractors/SubjectMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/SubjectMapExtractor.scala
index dd108187..291787b1 100644
--- a/src/main/scala/io/rml/framework/core/extractors/SubjectMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/SubjectMapExtractor.scala
@@ -32,8 +32,8 @@ trait SubjectMapExtractor extends TermMapExtractor[SubjectMap]
 
 object SubjectMapExtractor {
 
-  def apply(graphMapExtractor: GraphMapExtractor =  GraphMapExtractor()): SubjectMapExtractor = {
-    lazy val extractor = new StdSubjectMapExtractor(graphMapExtractor)
+  def apply(): SubjectMapExtractor = {
+    lazy val extractor = new StdSubjectMapExtractor()
     extractor
   }
 
diff --git a/src/main/scala/io/rml/framework/core/extractors/TriplesMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/TriplesMapExtractor.scala
index 4169d6a7..462f9d90 100644
--- a/src/main/scala/io/rml/framework/core/extractors/TriplesMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/TriplesMapExtractor.scala
@@ -48,18 +48,11 @@ object TriplesMapExtractor {
     * @param predicateObjectMapExtractor Extractor for predicate object maps.
     * @return
     */
-  def apply(logicalSourceExtractor: LogicalSourceExtractor = LogicalSourceExtractor(),
-            subjectMapExtractor: SubjectMapExtractor = SubjectMapExtractor(),
-            predicateObjectMapExtractor: PredicateObjectMapExtractor =
-            PredicateObjectMapExtractor(), graphMapExtractor: GraphMapExtractor = GraphMapExtractor())
+  def apply()
 
   : TriplesMapExtractor = {
 
-    lazy val extractor = new StdTriplesMapExtractor(
-      logicalSourceExtractor,
-      subjectMapExtractor,
-      graphMapExtractor,
-      predicateObjectMapExtractor)
+    lazy val extractor = StdTriplesMapExtractor
     extractor
   }
 
diff --git a/src/main/scala/io/rml/framework/engine/Transformation.scala b/src/main/scala/io/rml/framework/core/extractors/TriplesMapsCache.scala
similarity index 85%
rename from src/main/scala/io/rml/framework/engine/Transformation.scala
rename to src/main/scala/io/rml/framework/core/extractors/TriplesMapsCache.scala
index 87f403de..362cb292 100644
--- a/src/main/scala/io/rml/framework/engine/Transformation.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/TriplesMapsCache.scala
@@ -1,3 +1,7 @@
+package io.rml.framework.core.extractors
+
+import io.rml.framework.core.model.TriplesMap
+
 /**
   * MIT License
   *
@@ -21,17 +25,5 @@
   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   * THE SOFTWARE.
   *
-  **/
-package io.rml.framework.engine
-
-import io.rml.framework.core.model.{Entity, Parameters, Uri}
-
-trait Transformation {
-
-  def name: Uri
-
-  def execute(parameters: Parameters): Option[Entity]
-
-}
-
-
+  * */
+object TriplesMapsCache extends scala.collection.mutable.HashMap[String, TriplesMap]
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala
index 0e635bd7..f7665b5f 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala
@@ -107,8 +107,6 @@ class StdDataSourceExtractor extends DataSourceExtractor {
     require(hostNameProperties.length == 1, resource.uri.toString + ": exactly 1 hostname needed.")
     val portProperties = resource.listProperties(RMLVoc.Property.PORT)
     require(portProperties.length == 1, resource.uri.toString + ": exactly 1 port needed.")
-    val typeProperties = resource.listProperties(RMLVoc.Property.TYPE)
-    require(typeProperties.length == 1, resource.uri.toString + ": needs type.")
 
     val hostName = hostNameProperties.head match {
       case resource: RDFResource => throw new RMLException(resource.uri + ": hostname must be a literal.")
@@ -119,7 +117,6 @@ class StdDataSourceExtractor extends DataSourceExtractor {
       case literal: Literal => literal.value
     }
 
-    val _type = ExtractorUtil.matchLiteral(typeProperties.head)
-    TCPSocketStream(hostName, port.toInt, _type.value)
+    TCPSocketStream(hostName, port.toInt)
   }
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdFunctionMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdFunctionMapExtractor.scala
new file mode 100644
index 00000000..4288ed9c
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdFunctionMapExtractor.scala
@@ -0,0 +1,52 @@
+package io.rml.framework.core.extractors.std
+
+import io.rml.framework.core.extractors.{FunctionMapExtractor, PredicateObjectMapExtractor}
+import io.rml.framework.core.model.FunctionMap
+import io.rml.framework.core.model.rdf.RDFResource
+import io.rml.framework.core.vocabulary.RMLVoc
+
+class StdFunctionMapExtractor extends FunctionMapExtractor {
+
+  /**
+   * Lazy val to prevent circular reference and stack overflow when instantiating the class
+   */
+  lazy val pomExtractor = PredicateObjectMapExtractor()
+
+
+  /**
+   * Extract.
+   *
+   * @param node Node to extract from.
+   * @return
+   */
+  override def extract(node: RDFResource): List[FunctionMap] = {
+    this.logDebug("extract(node)")
+    extractFunctionMap("", node)
+  }
+
+
+  /**
+   * Extracts function term map in the mapping file and
+   * load the function specified into the static RMLEnvironment class
+   *
+   * @param resource
+   * @return
+   */
+  private def extractFunctionMap(fnParentMap: String, resource: RDFResource): List[FunctionMap] = {
+    val functionValues = resource.listProperties(RMLVoc.Property.FUNCTIONVALUE)
+
+    require(functionValues.size <= 1, "At most only 1 function value allowed.")
+    val result = functionValues.map(node => {
+      val functionValue = node.asInstanceOf[RDFResource]
+
+      val poms = pomExtractor.extract(functionValue)
+
+      FunctionMap(fnParentMap, functionValue.uri.toString, poms)
+
+    })
+
+    result
+  }
+
+
+}
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdGraphMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdGraphMapExtractor.scala
index 1be7a108..b082888f 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdGraphMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdGraphMapExtractor.scala
@@ -24,7 +24,7 @@
   **/
 package io.rml.framework.core.extractors.std
 
-import io.rml.framework.core.extractors.GraphMapExtractor
+import io.rml.framework.core.extractors.{FunctionMapExtractor, GraphMapExtractor}
 import io.rml.framework.core.model.rdf.{RDFNode, RDFResource}
 import io.rml.framework.core.model.{GraphMap, Literal, Uri}
 import io.rml.framework.core.vocabulary.RMLVoc
@@ -77,7 +77,7 @@ class StdGraphMapExtractor extends GraphMapExtractor {
 
   def extractGraph(resource: RDFResource): Option[GraphMap] = {
 
-    Some(GraphMap(resource.uri.toString, Some(resource.uri), None, None, extractTermType(resource)))
+    Some(GraphMap(resource.uri.toString, List(), Some(resource.uri), None, None, extractTermType(resource)))
 
   }
 
@@ -86,7 +86,8 @@ class StdGraphMapExtractor extends GraphMapExtractor {
     val template = extractTemplate(resource)
     val constant = extractConstant(resource)
     val reference = extractReference(resource)
-    Some(GraphMap(constant.getOrElse(resource.uri).toString, constant, reference, template, termType))
+    val functionMap = FunctionMapExtractor().extract(resource)
+    Some(GraphMap(constant.getOrElse(resource.uri).toString, functionMap, constant, reference, template, termType))
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdMappingExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdMappingExtractor.scala
index 4e673904..de7db01f 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdMappingExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdMappingExtractor.scala
@@ -33,7 +33,7 @@ import io.rml.framework.core.model.rdf.RDFGraph
   * Extractor for RMLMappings that injects all dependencies for all
   * sub-extractors.
   */
-class StdMappingExtractor extends MappingExtractor {
+class StdMappingExtractor extends MappingExtractor[RMLMapping] {
 
   /**
     * Extract.
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdMappingReader.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdMappingReader.scala
index 5f7865af..b567ae6a 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdMappingReader.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdMappingReader.scala
@@ -25,19 +25,19 @@
 
 package io.rml.framework.core.extractors.std
 
-import java.io.File
-
 import io.rml.framework.api.RMLEnvironment
 import io.rml.framework.core.extractors.{MappingExtractor, MappingReader}
 import io.rml.framework.core.model.rdf.RDFGraph
-import io.rml.framework.core.model.{RMLMapping, Uri}
+import io.rml.framework.core.model.{Graph, Uri}
 import io.rml.framework.core.util.Turtle
 import io.rml.framework.shared.ReadException
 
+import java.io.File
+
 /**
   * Standard implementation of the MappingReader trait
   */
-class StdMappingReader(mappingExtractor: MappingExtractor) extends MappingReader {
+class StdMappingReader[T<:Graph](mappingExtractor: MappingExtractor[T]) extends MappingReader[T] {
 
   /**
     * Reads a file and converts it to an RMLMapping.
@@ -47,7 +47,7 @@ class StdMappingReader(mappingExtractor: MappingExtractor) extends MappingReader
     * @return
     */
   @throws(classOf[ReadException])
-  override def read(file: File): RMLMapping = {
+  override def read(file: File): T = {
     val graph: RDFGraph = RDFGraph.fromFile(file, RMLEnvironment.getMappingFileBaseIRI(), Turtle)
     mappingExtractor.extract(graph)
   }
@@ -61,7 +61,7 @@ class StdMappingReader(mappingExtractor: MappingExtractor) extends MappingReader
     * @return
     */
   @throws(classOf[ReadException])
-  override def read(dump: String, graphUri: Uri): RMLMapping = {
+  override def read(dump: String, graphUri: Uri): T = {
     val graph: RDFGraph = RDFGraph(Some(graphUri))
     graph.read(dump, RMLEnvironment.getMappingFileBaseIRI(), Turtle)
     mappingExtractor.extract(graph)
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdObjectMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdObjectMapExtractor.scala
index 0cfeb4b2..d5416075 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdObjectMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdObjectMapExtractor.scala
@@ -25,7 +25,7 @@
 
 package io.rml.framework.core.extractors.std
 
-import io.rml.framework.core.extractors.{JoinConditionExtractor, ObjectMapExtractor, TriplesMapExtractor}
+import io.rml.framework.core.extractors.{FunctionMapExtractor, JoinConditionExtractor, ObjectMapExtractor}
 import io.rml.framework.core.model._
 import io.rml.framework.core.model.rdf.{RDFLiteral, RDFResource}
 import io.rml.framework.core.util.Util
@@ -69,6 +69,7 @@ class StdObjectMapExtractor extends ObjectMapExtractor {
     * @return
     */
   private def extractObjectMaps(resource: RDFResource): List[ObjectMap] = {
+    this.logDebug("extractObjectMaps(resource)")
     val property = RMLVoc.Property.OBJECTMAP
     val properties = resource.listProperties(property)
 
@@ -76,11 +77,9 @@ class StdObjectMapExtractor extends ObjectMapExtractor {
     properties.flatMap {
       case literal: RDFLiteral =>
         throw new RMLException(literal.toString + ": Cannot convert literal to predicate map.")
-      case resource: RDFResource => resource.getType match {
-        case Some(Uri(RMLVoc.Class.FUNCTIONTERMMAP)) => None // TODO: rethink this
-        case _ => Some(extractObjectMap(resource))
+      case resource: RDFResource => Some(extractObjectMap(resource))
       }
-    }
+
 
   }
 
@@ -102,8 +101,8 @@ class StdObjectMapExtractor extends ObjectMapExtractor {
     val joinCondition = extractJoinCondition(resource)
     val language = extractLanguage(resource)
     val datatype = extractDatatype(resource)
-
-    ObjectMap(resource.uri.toString, constant, reference, template, termType, datatype, language, parentTriplesMap, joinCondition)
+    val functionMap = FunctionMapExtractor().extract(resource)
+    ObjectMap(resource.uri.toString, functionMap, constant, reference, template, termType, datatype, language, parentTriplesMap, joinCondition)
   }
 
   def extractDatatype(resource: RDFResource): Option[Uri] = {
@@ -135,12 +134,17 @@ class StdObjectMapExtractor extends ObjectMapExtractor {
         }
 
       } else {
-
-        // if this is a reference-based term map or contains an referenceFormulation or has a datatype property the
-        // term type is a literal
-        val elements = resource.listProperties(RMLVoc.Property.REFERENCE) ++
+        // the term type is Literal when one of the following is true
+        //  - the resource is a reference-based term map
+        //  - the resource contains a referenceFormulation
+        //  - the resource has a datatype property
+        //  - the resource has a functionValue property // TODO: verify
+        val elements =
+          resource.listProperties(RMLVoc.Property.REFERENCE) ++
           resource.listProperties(RMLVoc.Property.REFERENCEFORMULATION) ++
-          resource.listProperties(RMLVoc.Property.DATATYPE)
+          resource.listProperties(RMLVoc.Property.DATATYPE) ++
+          resource.listProperties(RMLVoc.Property.FUNCTIONVALUE)
+
         if (elements.nonEmpty) Some(Uri(RMLVoc.Class.LITERAL))
         else Some(Uri(RMLVoc.Class.IRI))
       }
@@ -168,7 +172,7 @@ class StdObjectMapExtractor extends ObjectMapExtractor {
     languageLiteral
   }
 
-  private def extractParentTriplesMap(resource: RDFResource): Option[TriplesMap] = {
+  private def extractParentTriplesMap(resource: RDFResource): Option[String] = {
 
     val property = RMLVoc.Property.PARENTTRIPLESMAP
     val properties = resource.listProperties(property)
@@ -178,8 +182,7 @@ class StdObjectMapExtractor extends ObjectMapExtractor {
     if (properties.isEmpty) return None
 
     properties.head match {
-      case resource: RDFResource => TriplesMapExtractor().extractTriplesMapProperties(resource)
-        .flatMap(tm => Some(ParentTriplesMap(tm))) // transform to PTM
+      case resource: RDFResource => Some(resource.toString)
       case literal: Literal =>
         throw new RMLException(literal.toString + ": invalid parent triple map.")
     }
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateMapExtractor.scala
index e3858736..d0bff3b5 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateMapExtractor.scala
@@ -25,13 +25,14 @@
 
 package io.rml.framework.core.extractors.std
 
-import io.rml.framework.core.extractors.PredicateMapExtractor
+import io.rml.framework.core.extractors.{FunctionMapExtractor, PredicateMapExtractor}
 import io.rml.framework.core.model.rdf.{RDFLiteral, RDFResource}
 import io.rml.framework.core.model.{PredicateMap, Uri}
 import io.rml.framework.core.vocabulary.RMLVoc
 import io.rml.framework.shared.RMLException
 
-class StdPredicateMapExtractor extends PredicateMapExtractor {
+
+class StdPredicateMapExtractor() extends PredicateMapExtractor {
   /**
     * Extract.
     *
@@ -91,7 +92,9 @@ class StdPredicateMapExtractor extends PredicateMapExtractor {
     val template = extractTemplate(resource)
     val constant = extractConstant(resource)
     val reference = extractReference(resource)
-    PredicateMap(resource.uri.toString, constant, reference, template, termType)
+    val functionMap = FunctionMapExtractor().extract(resource)
+
+    PredicateMap(resource.uri.toString, functionMap, constant, reference, template, termType)
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateObjectMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateObjectMapExtractor.scala
index bb53ae6f..6be34471 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateObjectMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdPredicateObjectMapExtractor.scala
@@ -35,12 +35,7 @@ import io.rml.framework.shared.RMLException
 /**
   * Extractor for predicate object maps.
   */
-class StdPredicateObjectMapExtractor(predicateMapExtractor: PredicateMapExtractor,
-                                     objectMapExtractor: ObjectMapExtractor,
-                                     functionMapExtractor: FunctionMapExtractor,
-                                     graphMapExtractor: GraphMapExtractor)
-
-  extends PredicateObjectMapExtractor with Logging {
+class StdPredicateObjectMapExtractor extends PredicateObjectMapExtractor with Logging {
 
   /**
     * Extracts predicate object maps from a resource.
@@ -73,11 +68,17 @@ class StdPredicateObjectMapExtractor(predicateMapExtractor: PredicateMapExtracto
     * @return
     */
   private def extractPredicateObjectMap(resource: RDFResource): PredicateObjectMap = {
-    val objectMaps = objectMapExtractor.extract(resource)
-    val functionMaps = functionMapExtractor.extract(resource)
-    val predicateMaps = predicateMapExtractor.extract(resource)
-    val graphMap = graphMapExtractor.extract(resource)
-    PredicateObjectMap(resource.uri.toString, objectMaps, functionMaps, predicateMaps, graphMap)
+    this.logDebug("extractPredicateObjectMap : extracting object maps")
+    val objectMaps = ObjectMapExtractor().extract(resource)
+    
+    this.logDebug("extractPredicateObjectMap : extracting predicate maps")
+    val predicateMaps = PredicateMapExtractor().extract(resource)
+
+    this.logDebug("extractPredicateObjectMap : extracting graph map")
+    val graphMap = GraphMapExtractor().extract(resource)
+
+    this.logDebug("extractPredicateObjectMap : returning resulting PredicateObjectMap")
+    PredicateObjectMap(resource.uri.toString, objectMaps, predicateMaps, graphMap)
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdSubjectMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdSubjectMapExtractor.scala
index aa185db9..e10810ca 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdSubjectMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdSubjectMapExtractor.scala
@@ -25,7 +25,7 @@
 
 package io.rml.framework.core.extractors.std
 
-import io.rml.framework.core.extractors.{GraphMapExtractor, SubjectMapExtractor}
+import io.rml.framework.core.extractors.{FunctionMapExtractor, GraphMapExtractor, SubjectMapExtractor}
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model.rdf.{RDFLiteral, RDFResource}
 import io.rml.framework.core.model.{Literal, SubjectMap, Uri}
@@ -35,7 +35,7 @@ import io.rml.framework.shared.RMLException
 /**
   * Extractor for extracting Subject Maps from RDFResources.
   */
-class StdSubjectMapExtractor(graphMapExtractor: GraphMapExtractor) extends SubjectMapExtractor with Logging {
+class StdSubjectMapExtractor extends SubjectMapExtractor with Logging {
 
   /**
     * Extracts a SubjectMap from a resource.
@@ -81,7 +81,9 @@ class StdSubjectMapExtractor(graphMapExtractor: GraphMapExtractor) extends Subje
     val constant = extractConstant(resource)
     val template = extractTemplate(resource)
     val termType = extractTermType(resource)
-    val graphMap = graphMapExtractor.extract(resource)
+    val graphMap = GraphMapExtractor().extract(resource)
+
+    val functionMap = FunctionMapExtractor().extract(resource)
 
     logDebug(resource.uri + ": Extracted from subject map" +
       ": reference -> " + reference +
@@ -91,7 +93,7 @@ class StdSubjectMapExtractor(graphMapExtractor: GraphMapExtractor) extends Subje
       ", graphMap -> " + graphMap +
       ", class -> " + _class)
 
-    SubjectMap(resource.uri.toString, _class, constant, reference, template, termType, graphMap)
+    SubjectMap(resource.uri.toString, _class, functionMap, constant, reference, template, termType, graphMap)
   }
 
   override def extractTermType(resource: RDFResource): Option[Uri] = {
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdTriplesMapExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdTriplesMapExtractor.scala
index c0046f66..298fce3c 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdTriplesMapExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdTriplesMapExtractor.scala
@@ -25,7 +25,7 @@
 
 package io.rml.framework.core.extractors.std
 
-import io.rml.framework.core.extractors._
+import io.rml.framework.core.extractors.{TriplesMapsCache, _}
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model.rdf.{RDFGraph, RDFResource}
 import io.rml.framework.core.model.{TriplesMap, Uri}
@@ -35,13 +35,38 @@ import io.rml.framework.shared.RMLException
 /**
   * Extractor for extracting triple maps from a graph.
   */
-class StdTriplesMapExtractor(logicalSourceExtractor: LogicalSourceExtractor,
-                             subjectMapExtractor: SubjectMapExtractor,
-                             graphMapExtractor: GraphMapExtractor,
-                             predicateObjectMapExtractor: PredicateObjectMapExtractor)
+object StdTriplesMapExtractor extends TriplesMapExtractor with Logging {
 
-  extends TriplesMapExtractor with Logging {
 
+  /**
+   * Helper method for inferring whether the given resource is a TriplesMap.
+   * A resource can be considered a TriplesMap when any of the following conditions are met
+   *  1. (trival case) the resource has the TriplesMap type
+   *  2. the resource references the following resources:
+   *      - exactly ONE logicalSource, specified by rml:logicalSource.
+   *      - exactly ONE subjectMap. It may be specified in two ways
+   *          - a) using rr:subjectMap
+   *          - b) using constant shortcut property rr:subject
+   * @param resource
+   * @return [Boolean] indicating whether the resource is a TriplesMap
+   */
+  private def isTriplesMap(resource : RDFResource) : Boolean = {
+    val logicalSourceProperty = RMLVoc.Property.LOGICALSOURCE
+    val subjectMapProperty = RMLVoc.Property.SUBJECTMAP
+    val subjectConstantProperty = RMLVoc.Property.SUBJECT
+
+    // trivial case
+    val isTriplesMap = resource.getType.equals(Some(Uri(RMLVoc.Class.TRIPLESMAP)))
+
+    // property requirements for a triplesmap
+    val hasExactlyOneLogicalSource = resource.listProperties(logicalSourceProperty).length==1
+    val hasExactlyOneSubjectMap =
+      (resource.listProperties(subjectMapProperty) ++ resource.listProperties(subjectConstantProperty)).length==1
+
+    // infer whether the resource is a triples map
+    val resourceIsTriplesMap = isTriplesMap|(hasExactlyOneLogicalSource&hasExactlyOneSubjectMap)
+    resourceIsTriplesMap
+  }
   /**
     * Extracts a set of triple maps from a graph.
     * If extraction for a triple map fails, this triple map will be skipped.
@@ -50,7 +75,6 @@ class StdTriplesMapExtractor(logicalSourceExtractor: LogicalSourceExtractor,
     * @return
     */
   override def extract(graph: RDFGraph): List[TriplesMap] = {
-
     val triplesMapResources = filterTriplesMaps(graph)
 
     // iterate over each triple map resource
@@ -65,12 +89,10 @@ class StdTriplesMapExtractor(logicalSourceExtractor: LogicalSourceExtractor,
     * @param graph
     */
   private def filterTriplesMaps(graph: RDFGraph): List[RDFResource] = {
-
     // filter all triple map resources from the graph
-    val typeUri = Uri(RMLVoc.Class.TRIPLESMAP)
-    val triplesMapResources = (graph.filterResources(typeUri) ++
-      graph.filterProperties(Uri(RMLVoc.Property.LOGICALSOURCE))).distinct
-
+    val logicalSourcePropertyUri = Uri(RMLVoc.Property.LOGICALSOURCE)
+    val potentialTriplesMapResources = graph.filterProperties(logicalSourcePropertyUri)
+    val triplesMapResources = potentialTriplesMapResources.filter(isTriplesMap)
 
     // debug log, inside check for performance
     if (isDebugEnabled) {
@@ -88,25 +110,31 @@ class StdTriplesMapExtractor(logicalSourceExtractor: LogicalSourceExtractor,
     * @return
     */
   def extractTriplesMapProperties(resource: RDFResource): Option[TriplesMap] = {
+    val resourceStr = resource.toString;
     // errors can occur during extraction of sub structures
-    try {
-
-      // create a new triple map by extracting all sub structures
-      val triplesMap = TriplesMap(predicateObjectMapExtractor.extract(resource),
-        logicalSourceExtractor.extract(resource),
-        subjectMapExtractor.extract(resource),
-        resource.uri.toString,
-        graphMapExtractor.extract(resource)
-      )
-      Some(triplesMap)
-
-    } catch {
-      // in case of an error, skip this triple map and log warnings
-      case e: RMLException =>
-        e.printStackTrace()
-        logWarning(e.getMessage)
-        logWarning(resource.uri + ": Skipping triple map.")
-        throw e
+    if (TriplesMapsCache.contains(resourceStr)) {
+      TriplesMapsCache.get(resourceStr)
+    } else {
+      try {
+
+        // create a new triple map by extracting all sub structures
+        val triplesMap = TriplesMap(PredicateObjectMapExtractor().extract(resource),
+          LogicalSourceExtractor().extract(resource),
+          SubjectMapExtractor().extract(resource),
+          resource.uri.toString,
+          GraphMapExtractor().extract(resource)
+        )
+        val t = TriplesMapsCache.put(resourceStr, triplesMap);
+        Some(triplesMap)
+
+      } catch {
+        // in case of an error, skip this triple map and log warnings
+        case e: RMLException =>
+          e.printStackTrace()
+          logWarning(e.getMessage)
+          logWarning(resource.uri + ": Skipping triple map.")
+          throw e
+      }
     }
   }
 
diff --git a/src/main/scala/io/rml/framework/core/function/FunctionLoader.scala b/src/main/scala/io/rml/framework/core/function/FunctionLoader.scala
new file mode 100644
index 00000000..af4f4eaf
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/FunctionLoader.scala
@@ -0,0 +1,138 @@
+package io.rml.framework.core.function
+
+import io.rml.framework.api.{FnOEnvironment, RMLEnvironment}
+import io.rml.framework.core.function.model.{Function, FunctionMetaData, Parameter}
+import io.rml.framework.core.function.std.StdFunctionLoader
+import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.model.Uri
+import io.rml.framework.core.model.rdf.{RDFGraph, RDFNode}
+import io.rml.framework.core.util.Turtle
+
+import java.io.{File, IOException}
+import scala.collection.mutable.{Map => MutableMap}
+import scala.reflect.io.Path
+
+abstract class FunctionLoader extends Logging {
+  /**
+   * Map Function Uri to FunctionMetaData object
+   */
+  protected val functionMap: MutableMap[Uri, FunctionMetaData] = MutableMap()
+
+  def getSources: List[String] = {
+    functionMap.values.map(_.source).toList.distinct
+  }
+  def getClassNames : List[String] = {
+    functionMap.values.map(_.className).toList.distinct
+  }
+  /**
+   * Creates and returns a [[Function]] for [[FunctionMetaData]] given function [[Uri]], if the function uri is present.
+   *
+   * @param uri: function uri
+   * @return  function (if successful)
+   */
+  def createFunction(uri: Uri): Option[Function] = {
+    logDebug(s"createFunction: ${uri.uri}")
+
+    val optFunctionMetaData = functionMap.get(uri)
+
+    if (optFunctionMetaData.isDefined) {
+      val functionMetaData = optFunctionMetaData.get
+      logDebug(s"Creating function: $uri, ${functionMetaData.toString}" )
+      Some(Function(functionMetaData.identifier, functionMetaData))
+    } else {
+      // when the function uri is not present in the function map, complain.
+      val availableFunctionURIs = functionMap.keys.map(u=>u.toString)
+      throw new IOException(s"The function with URI ${uri.toString} can not be found.\n" +
+        s"The available function URIs are: " + availableFunctionURIs)
+    }
+  }
+
+  /**
+   * The given `functionMappingFile` should be a Turtle-file containing the function mappings. These mappings will be parsed and
+   * the FunctionLoader's functionMap is updated accordingly.
+   *
+   * @param functionMappingFile
+   * @return
+   */
+  def parseFunctionMapping(functionMappingFile: File): FunctionLoader = {
+    val graph = RDFGraph.fromFile(functionMappingFile, RMLEnvironment.getGeneratorBaseIRI(),Turtle)
+    parseFunctionMapping(graph)
+    this
+  }
+
+  /**
+   * The given `graph` should contain the function mappings. These mappings will be parsed and
+   * the FunctionLoader's functionMap is updated accordingly.
+   *
+   * @param graph [[RDFGraph]] representing a function mapping
+   * @return [[FunctionLoader]]
+   */
+  def parseFunctionMapping(graph: RDFGraph): FunctionLoader
+
+  /**
+   * Parse [[Parameter]] from the given [[RDFNode]] which represents the parameter
+   *
+   * @param rdfNode [[RDFNode]] containing the mapping information of the parameter
+   * @param pos [[Int]] integer position of the parameter
+   * @return
+   */
+  def parseParameter(rdfNode: RDFNode, pos: Int): Parameter
+
+}
+
+
+object FunctionLoader extends Logging{
+  private var singletonFunctionLoader : Option[FunctionLoader] = None
+
+  /**
+   * Private helper method for reading in the function descriptions as an RDFGraph.
+   * @param filePath
+   * @return RDFGraph containing the function descriptions.
+   */
+  private def readFunctionDescriptionsFromFile(filePath : String): RDFGraph = {
+    logDebug(s"FunctionLoader is reading function descriptions from : ${filePath}")
+    RDFGraph.fromFile(new File(filePath), RMLEnvironment.getGeneratorBaseIRI(), Turtle)
+  }
+
+  /**
+   * Construction of the (singleton) FunctionLoader instance.
+   * @return FunctionLoader
+   */
+  def apply(functionDescriptionPaths : List[Path] = FnOEnvironment.getFunctionDescriptionFilePaths(),
+            functionMappingPaths : List[Path] = FnOEnvironment.getFunctionMappingFilePaths()
+           ): Option[FunctionLoader] = {
+      if(singletonFunctionLoader.isEmpty) {
+
+        // The functionDescriptionsGraph is populated by iterating over the filepaths of the function description files.
+        // These function description files are obtained from the RMLEnvironment.
+        val fdit =functionDescriptionPaths.map(_.path).iterator
+        // construct the initial functionDescriptionTriplesGraph using the first functiondescription filepath
+        val functionDescriptionsGraph : Option[RDFGraph] =
+          if(fdit.hasNext)
+            Some(readFunctionDescriptionsFromFile(fdit.next()))
+          else
+            None
+
+        // If more function description filepaths are specified, they will be read in.
+        // The resulting triples will be added to the functionDescriptionsGraph
+        while (fdit.hasNext) {
+          val fdescGraph = readFunctionDescriptionsFromFile(fdit.next())
+          functionDescriptionsGraph.get.addTriples(fdescGraph.listTriples)
+        }
+
+        // construct functionLoader
+        if(functionDescriptionsGraph.isDefined) {
+          singletonFunctionLoader = Some(StdFunctionLoader(functionDescriptionsGraph.get))
+          // now parse the mappings
+          functionMappingPaths.foreach(fmp=>singletonFunctionLoader.get.parseFunctionMapping(new File(fmp.path)))
+
+        } else {
+          logWarning("No function graph found. Continuing without loading functions.")
+          None
+        }
+      }
+      singletonFunctionLoader
+    }
+}
+
+
diff --git a/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala b/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala
new file mode 100644
index 00000000..cd852b94
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala
@@ -0,0 +1,79 @@
+package io.rml.framework.core.function
+
+import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.function.model.Parameter
+import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.model.{Entity, Literal, Uri}
+import io.rml.framework.core.vocabulary.RMLVoc
+import io.rml.framework.shared.RMLException
+
+import java.io.File
+import java.net.MalformedURLException
+import java.time.Instant
+import scala.reflect.internal.util.ScalaClassLoader.URLClassLoader
+
+object FunctionUtils extends Logging {
+
+
+  /** *
+   * TODO: IMPLEMENT THIS THE SCALA WAY SINCE TYPE ERASURE WILL CAUSE PROBLEM WITH REFLECTIONS IN SCALA
+   *
+   */
+  /**
+   * See [[http://stackoverflow.com/questions/3216780/problem-reloading-a-jar-using-urlclassloader?lq=1]]
+   * for problems relating to unclosed dirty jar file handle if there ever was a need to reload the jar file
+   * at runtime.
+   *
+   * See [[http://stackoverflow.com/questions/8867766/forName()scala-dynamic-object-class-loading]]
+   * for loading in scala object using reflection
+   *
+   * See [[https://medium.com/@giposse/scala-reflection-d835832ed13a]] for a better scala reflection tutorial?
+   *
+   * @param jarFile
+   * @param className
+   * @return
+   */
+  def loadClassFromJar(jarFile: File, className: String): Class[_] = {
+    logDebug(s"Loading $className from jar file $jarFile")
+    try {
+      val classloader = new URLClassLoader(List(jarFile.toURI.toURL), RMLEnvironment.getClass.getClassLoader)
+      logDebug(s"Class loader ${classloader.getParent}")
+      Class.forName(className, true, classloader)
+    } catch {
+      case e@(_: MalformedURLException | _: ClassNotFoundException) =>
+        logError(e.getMessage)
+        throw e
+    }
+  }
+
+  def typeCastDataType(output: Entity, dataType: Option[Uri]): Option[Entity] = {
+    if(dataType.isDefined){
+      val typeClass = getTypeClass(dataType.get)
+      val castedValue = Parameter(typeClass, output.toString).getValue
+
+      castedValue.map(e => Literal(e.toString))
+    }else{
+      Some(output)
+    }
+  }
+
+  def getTypeClass(uri: Uri): Class[_] = {
+    uri match {
+
+      case Uri(RMLVoc.Type.XSD_POSITIVE_INTEGER) => classOf[Int]
+      case Uri(RMLVoc.Type.XSD_INTEGER) => classOf[Int]
+      case Uri(RMLVoc.Type.XSD_INT) => classOf[Int]
+      case Uri(RMLVoc.Type.XSD_STRING) => classOf[String]
+      case Uri(RMLVoc.Type.XSD_DOUBLE) => classOf[Double]
+      case Uri(RMLVoc.Type.XSD_LONG) => classOf[Long]
+      case Uri(RMLVoc.Type.XSD_DATETIME) => classOf[Instant]
+      case Uri(RMLVoc.Type.XSD_BOOLEAN) => classOf[Boolean]
+      case Uri(RMLVoc.Type.RDF_LIST) => classOf[List[_]]
+      case Uri(RMLVoc.Type.XSD_ANY) => classOf[Any]
+      case Uri(RMLVoc.Type.RDF_OBJECT) => classOf[Any]
+      case _ => throw new RMLException(s"Type $uri not supported for parameter")
+    }
+  }
+
+
+}
diff --git a/src/main/scala/io/rml/framework/core/function/ReflectionUtils.scala b/src/main/scala/io/rml/framework/core/function/ReflectionUtils.scala
new file mode 100644
index 00000000..17540edd
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/ReflectionUtils.scala
@@ -0,0 +1,92 @@
+package io.rml.framework.core.function
+
+import java.lang.reflect.Method
+import java.net.URL
+import scala.reflect.internal.util.ScalaClassLoader
+
+object ReflectionUtils {
+
+  def loadJar(url : URL) = {
+    throw new NotImplementedError()
+  }
+  def loadClass(className : String) = {
+    val loadedClassOption = ScalaClassLoader.contextLoader.tryToInitializeClass(className)
+    if(loadedClassOption.isDefined)
+      loadedClassOption.get
+    else
+      throw new Exception(s"unable to load ${className}")
+  }
+
+  def searchByMethodNameAndParameterTypes(cls : Class[_], methodName : String, parameterTypes : Class[_]*) : Option[Method] = {
+    try {
+      Some(cls.getDeclaredMethod(methodName, parameterTypes:_*))
+    }
+    catch {
+      case nme: NoSuchMethodException => {
+        println(s"Unable to find ${methodName} using cls.getDeclaredMethod; returning the FIRST occurrence by name")
+        filterByMethodName(cls, methodName).headOption
+      }
+    }
+  }
+
+  def filterByMethodName(cls : Class[_], methodName : String) : List[Method] = {
+    cls.getDeclaredMethods.filter(m=>m.getName.endsWith(methodName)).toList
+  }
+
+  def castUsingGenericMethodParameterTypes(method : java.lang.reflect.Method, inputParameterValues : List[AnyRef]) = {
+    println(s"${getClass.getCanonicalName}#castUsingGenericMethodParameterTypes")
+
+    val genericParameterTypes = method.getGenericParameterTypes
+    genericParameterTypes
+      .zip(inputParameterValues)
+      .map(
+        pair => {
+          val gt = pair._1
+          val ip = pair._2
+          gt.getTypeName match {
+            case "java.util.List<java.lang.String>" => {
+              val resultArrayList = new java.util.ArrayList[String]()
+              ip.asInstanceOf[List[_]].foreach(e=>resultArrayList.add(e.toString))
+              resultArrayList
+            }
+            case _ => ip
+          }
+        }
+    )
+  }
+
+  /**
+   * Given a method and inputParameterValues, castUsingMethodParameterTypes will use the given method's parameter types
+   * to cast the input parameter values.
+ *
+   * @param method
+   * @param inputParameterValues
+   * @return
+   */
+  def castUsingMethodParameterTypes(method : java.lang.reflect.Method, inputParameterValues : List[AnyRef]) = {
+    println(s"${getClass.getCanonicalName}#castUsingMethodParameterTypes")
+
+
+
+    val parameterTypes = method.getParameterTypes
+    parameterTypes
+      .zip(inputParameterValues)
+      .map(
+        pair => {
+          val gt = pair._1
+          val ip = pair._2
+          gt.getTypeName match {
+            case "java.util.List" => {
+              val resultArrayList = new java.util.ArrayList[Object]()
+              ip.asInstanceOf[List[_]].foreach(e=>resultArrayList.add(e.toString))
+              resultArrayList
+            }
+            case "java.lang.Boolean"|"Boolean" => ip.toString.toBoolean
+            case _ => ip
+          }
+        }
+      )
+      .map(_.asInstanceOf[AnyRef])
+  }
+
+}
diff --git a/src/main/scala/io/rml/framework/core/function/flink/FnOEnvironmentLoader.scala b/src/main/scala/io/rml/framework/core/function/flink/FnOEnvironmentLoader.scala
new file mode 100644
index 00000000..c64f7fec
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/flink/FnOEnvironmentLoader.scala
@@ -0,0 +1,118 @@
+package io.rml.framework.core.function.flink
+
+import io.rml.framework.Main.logError
+import io.rml.framework.api.FnOEnvironment
+import io.rml.framework.flink.item.Item
+import org.apache.flink.api.common.functions.RichMapFunction
+import org.apache.flink.configuration.Configuration
+
+import java.net.URLClassLoader
+import scala.util.{Failure, Success, Try}
+
+/**
+ * AbstractRichIdentityFunction-subtypes do not alter or access the input data.
+ * They can be used to access the runtime context before or after the map-function is called,
+ * using the .open() and .close() inherited from RichMapFunction, respectively.
+ *
+ *
+ * @tparam T
+ */
+abstract class AbstractRichIdentityFunction[T] extends RichMapFunction[T,T] {
+  /**
+   * Identity. Passes input to output.
+   * @param value
+   * @return
+   */
+  override def map(value: T): T = value
+}
+
+/**
+ * Trait for RichMapFunction that use streams (i.e. Iterables of types IN|OUT)
+ * @tparam IN: input type of
+ * @tparam OUT
+ */
+trait RichStreamFunction[IN,OUT] extends RichMapFunction[Iterable[IN], Iterable[OUT]]
+
+/**
+ *
+ * @tparam T
+ */
+abstract class AbstractRichIdentityStreamFunction[T] extends RichStreamFunction[T,T] {
+  override def map(value: Iterable[T]): Iterable[T] = value
+}
+
+/**
+ * Concrete class that only passes a stream of [[Item]]
+ */
+class RichStreamItemIdentityFunction extends AbstractRichIdentityStreamFunction[Item]
+
+/**
+ * Concrete class that only passes [[Item]]
+ */
+class RichItemIdentityFunction extends AbstractRichIdentityFunction[Item]
+
+/**
+ *
+ * Looks for the given list of [[jarNames]] using the runtime context's classloader which is used
+ * to load the given [[classNames]] into the [[FnOEnvironment]].
+ *
+ * @param jarNames
+ * @param classNames
+ */
+class AbstractFnOEnvironmentLoader[T](jarNames : List[String],
+                                 classNames : List[String]) extends AbstractRichIdentityFunction[T] {
+  override def open(parameters: Configuration): Unit = {
+
+    /**
+     * It usually works to put the job’s JAR file into the /lib directory. The JAR
+     * will be part of both the classpath (the AppClassLoader) and the dynamic class
+     * loader (FlinkUserCodeClassLoader). Because the AppClassLoader is the parent of
+     * the FlinkUserCodeClassLoader (and Java loads parent-first, by default), this
+     * should result in classes being loaded only once.
+     * Ref: https://ci.apache.org/projects/flink/flink-docs-stable/monitoring/debugging_classloading.html#avoiding-dynamic-classloading-for-user-code
+     */
+
+    // 1. find resource URLs using UserCodeClassLoader
+    val ucl = getRuntimeContext.getUserCodeClassLoader
+    val resourceURLs = jarNames.map(jn=>ucl.getResource(jn))
+
+    // 2. initialize URLClassLoader with resource URLs from step (1.)
+    val classLoader = new URLClassLoader(resourceURLs.toArray, ucl)
+
+    // 3. load the classes into the FnOEnvironment
+    classNames.foreach{
+      cn => {
+        // add class object to FnOEnvironment if not existent
+        if(!FnOEnvironment.loadedClassesMap.contains(cn)) {
+          //val cls = classLoader.loadClass(cn)
+          Try(classLoader.loadClass(cn)) match {
+            case Success(cls) =>FnOEnvironment.loadedClassesMap.put(cn, cls)
+            case Failure(exception) => logError(s"Unable to load ${cn} into FnO Environment. Details: ${exception.getMessage}")
+          }
+        }
+      }
+    }
+    super.open(parameters)
+  }
+}
+
+/**
+ * [[FnOEnvironmentStreamLoader]] can be used in a DataStream[Item].
+ * Looks for the given list of [[jarNames]] using the runtime context's classloader which is used
+ * to load the given [[classNames]] into the [[FnOEnvironment]].
+ *
+ * @param jarNames
+ * @param classNames
+ */
+class FnOEnvironmentStreamLoader(jarNames : List[String], classNames : List[String])
+  extends AbstractFnOEnvironmentLoader[Iterable[Item]](jarNames = jarNames,classNames = classNames)
+/**
+ * [[FnOEnvironmentLoader]] can be used in a DataSet[Item].
+ * Looks for the given list of [[jarNames]] using the runtime context's classloader which is used
+ * to load the given [[classNames]] into the [[FnOEnvironment]].
+ *
+ * @param jarNames
+ * @param classNames
+ */
+class FnOEnvironmentLoader(jarNames : List[String], classNames : List[String])
+  extends AbstractFnOEnvironmentLoader[Item](jarNames = jarNames,classNames = classNames)
diff --git a/src/main/scala/io/rml/framework/core/function/model/DynamicFunction.scala b/src/main/scala/io/rml/framework/core/function/model/DynamicFunction.scala
new file mode 100644
index 00000000..6fdf4321
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/model/DynamicFunction.scala
@@ -0,0 +1,149 @@
+package io.rml.framework.core.function.model
+
+import io.rml.framework.api.FnOEnvironment
+import io.rml.framework.core.function.{FunctionUtils, ReflectionUtils}
+import io.rml.framework.core.model.{Entity, Literal, Uri}
+import io.rml.framework.flink.sink.FlinkRDFQuad
+
+import java.io.{File, IOException, ObjectInputStream, ObjectOutputStream}
+import java.lang.reflect.Method
+
+
+/**
+ * A dynamic function is loaded from an external jar at-runtime.
+ *
+ * @param identifier [[String]] used to identify this DynamicFunction
+ * @param metaData   contains information required for loading, initializing the function
+ */
+case class DynamicFunction(identifier: String, metaData: FunctionMetaData) extends Function {
+
+  @transient
+  private var optMethod: Option[Method] = None
+
+  @throws(classOf[IOException])
+  private def writeObject(out: ObjectOutputStream): Unit = {
+    out.defaultWriteObject()
+  }
+
+  /**
+   * There are two ways in which the method can be loaded:
+   * 1. From the FnOEnvironment. This means that the class was by Flink's UserCodeClassLoader was able to retrieve
+   *  the class from an external jar (located in FLINK_HOME/lib)
+   * 2. From a jar that is bundled with the RMLStreamer.
+   * @return
+   */
+  private def loadMethod() : Option[Method] = {
+    val optClass = FnOEnvironment.loadedClassesMap.get(metaData.className)
+    if (optClass.isDefined) {
+      logDebug(s"The class ${metaData.className} was found in the external jars. Will try to load the function ${metaData.methodName}")
+      optMethod = ReflectionUtils.searchByMethodNameAndParameterTypes(optClass.get, metaData.methodName, metaData.inputParam.map(_.paramType): _*)
+    } else {
+      logInfo(s"Could not find ${metaData.className} for this function in the FnOEnvironment" +
+        s" (i.e. the class could not be found in an external jar)." +
+        s"If the specified source (${metaData.source}) is included in the RML Streamer's resources, " +
+        s"and the class (${metaData.className}) can be found,  " +
+        s"then ${metaData.methodName} will be loaded from there.")
+      val jarFile = getClass.getClassLoader.getResource(metaData.source).getFile
+      val classOfMethod = FunctionUtils.loadClassFromJar(new File(jarFile), metaData.className)
+      optMethod = ReflectionUtils.searchByMethodNameAndParameterTypes(classOfMethod, metaData.methodName, metaData.inputParam.map(_.paramType): _*)
+    }
+    optMethod
+  }
+
+  override def execute(paramTriples: List[FlinkRDFQuad]): Option[Iterable[Entity]] = {
+    // if a group (key: uri) results in a list with 1 element, extract that single element
+    // otherwise, when a group has a list with more than 1 element, keep it as a list
+    val argResourcesGroupedByUri = paramTriples.groupBy(_.predicate).map {
+      pair => {
+        pair._2.length match {
+          case 0 => pair._1.uri -> None
+          case 1 => pair._1.uri -> pair._2.head
+          case _ => pair._1.uri -> pair._2.toList
+        }
+      }
+    }
+
+    val argObjectsGroupedByUri = argResourcesGroupedByUri.map {
+      pair => {
+        if (pair._2.isInstanceOf[Iterable[FlinkRDFQuad]]) {
+          pair._1 -> pair._2.asInstanceOf[Iterable[FlinkRDFQuad]].map(x => x.`object`.value.toString)
+        } else {
+          pair._1 -> pair._2.asInstanceOf[FlinkRDFQuad].`object`.value.toString
+        }
+
+      }
+    }
+
+    val orderedArgValues = metaData
+      .inputParam
+      .sortBy(_.position).flatMap(ip => {
+
+      if (argObjectsGroupedByUri.contains(ip.paramUri))
+        argObjectsGroupedByUri.get(ip.paramUri)
+      else
+        Some(null)
+
+    })
+
+    if (orderedArgValues.size == metaData.inputParam.size) {
+
+      val method = loadMethod.getOrElse(throw new Exception("No method was initialized."))
+      val castParameterValues: Array[AnyRef] = ReflectionUtils.castUsingMethodParameterTypes(method, orderedArgValues)
+
+      try {
+        val output = method.invoke(null, castParameterValues: _*)
+        val result = metaData.outputParam.flatMap(elem => elem.getValue(output)) map (elem => Literal(elem.toString))
+        Some(result)
+      } catch {
+        case e: Exception => {
+          logError(s"The following exception occurred when invoking the method ${method.getName}: ${e.getMessage}." +
+            s"\nThe result will be set to None.")
+          None
+        }
+      }
+    }
+    else None
+
+
+  }
+
+
+
+
+  @throws(classOf[IOException])
+  @throws(classOf[ClassNotFoundException])
+  private def readObject(in: ObjectInputStream): Unit = {
+    in.defaultReadObject()
+    optMethod = None
+
+  }
+
+  override def execute(arguments: Map[Uri, String]): Option[Iterable[Entity]] = {
+    val inputParams = metaData.inputParam
+    // casted to List[AnyRef] since method.invoke(...) only accepts reference type but not primitive type of Scala
+    val paramsOrdered = arguments.groupBy(_._1.uri).map(_._2.asInstanceOf[AnyRef]).toList
+
+    val outputParams = metaData.outputParam
+
+    if (paramsOrdered.size == inputParams.size) {
+      val method = optMethod.get
+      val castedParameterValues = ReflectionUtils.castUsingMethodParameterTypes(method, paramsOrdered)
+      val output = method.invoke(null, castedParameterValues: _*)
+
+      if (output != null) {
+        val result = outputParams.flatMap(elem => elem.getValue(output)) map (elem => Literal(elem.toString))
+        Some(result)
+      } else
+        None
+    } else {
+      //TODO: complain about inputparams size != params ordered
+      logError(s"Not all input parameters for ${metaData.methodName} could be bound...")
+      None
+    }
+  }
+
+
+  override def getMethod: Option[Method] = {
+    optMethod
+  }
+}
diff --git a/src/main/scala/io/rml/framework/core/function/model/Function.scala b/src/main/scala/io/rml/framework/core/function/model/Function.scala
new file mode 100644
index 00000000..085fb231
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/model/Function.scala
@@ -0,0 +1,30 @@
+package io.rml.framework.core.function.model
+
+import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.model.{Entity, Node, Uri}
+import io.rml.framework.flink.sink.FlinkRDFQuad
+
+import java.lang.reflect.Method
+abstract class Function extends Node with Logging{
+
+
+  def name: Uri = Uri(identifier)
+
+  def getMethod: Option[Method]
+
+
+  def execute(paramTriples: List[FlinkRDFQuad]): Option[Iterable[Entity]]
+
+  @deprecated("Please use execute(paramTriples: List[FlinkRDFQuad]) instead")
+  def execute(argumentsMap: Map[Uri, String]): Option[Iterable[Entity]]
+
+
+}
+
+object Function extends Logging{
+
+  def apply(identifier:String, functionMetaData: FunctionMetaData): Function={
+    logDebug("Companion: Function - apply(identifier, functionMetaData)")
+    DynamicFunction(identifier, functionMetaData)
+  }
+}
diff --git a/src/main/scala/io/rml/framework/core/function/model/FunctionMetaData.scala b/src/main/scala/io/rml/framework/core/function/model/FunctionMetaData.scala
new file mode 100644
index 00000000..344d805c
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/model/FunctionMetaData.scala
@@ -0,0 +1,20 @@
+package io.rml.framework.core.function.model
+
+/**
+ * Contains metadata of a function that can be called by an RML Mapping.
+ *
+ * @param source      string path of the source
+ * @param className   class name containing the [[Function]]
+ * @param methodName  method name of the [[Function]]
+ * @param inputParam  [[List]] of input parameters for the [[Function]]
+ * @param outputParam [[List]] of expected output parameters from the [[Function]]
+ */
+case class FunctionMetaData(source: String, className: String, methodName: String, inputParam: List[Parameter], outputParam: List[Parameter]) extends {
+
+  /**
+   * Used as an id for each inheriting objects for debugging ( maybe equivalence checking? e.g. in TermMap and TripleMap).
+   *
+   * @return
+   */
+  def identifier: String = s"($source, $className, $methodName, $inputParam, $outputParam)"
+}
diff --git a/src/main/scala/io/rml/framework/core/function/model/Parameter.scala b/src/main/scala/io/rml/framework/core/function/model/Parameter.scala
new file mode 100644
index 00000000..bf635d4f
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/model/Parameter.scala
@@ -0,0 +1,132 @@
+package io.rml.framework.core.function.model
+
+import io.rml.framework.core.model.{Node, Uri}
+
+import java.time.Instant
+import scala.util.parsing.json.JSON
+
+/**
+ * Case classes which could be useful in pattern matching empty parameter values
+ */
+
+case class EmptyParameter(paramType: Class[_], paramUri: Uri, position: Int) extends Parameter {
+  override val paraValue: Option[String] = None
+
+}
+
+case class DefinedParameter(paramType: Class[_] = classOf[String], paramUri: Uri, paraValue: Option[String], position: Int) extends Parameter
+
+
+abstract class Parameter extends Node {
+  /**
+   * Models the parameters used by the functions.
+   *
+   * `paramType` type of the parameter
+   * `paramUri`  Uri representation of the parameter
+   * `paraValue` [[String]] representation of the parameter
+   * `position`  [[Int]] position of the parameter in the argument of the function needed for reflection
+   *
+   */
+  val paramType: Class[_]
+  val paramUri: Uri
+  val paraValue: Option[String]
+  val position: Int
+
+  override def identifier: String = paramUri.toString + " " + paraValue.getOrElse("None")
+
+  def getValue: Option[Any] = {
+    getValue(paraValue.getOrElse(throw new IllegalStateException(s"${this}'s value option is empty.")))
+  }
+
+  /**
+   * Get the parameter value and cast it according to the given
+   * [[paramType]].
+   *
+   * @return value of the parameter of type specified by [[paramType]]
+   */
+
+
+  def getValue(paraValue: Any): Option[Any] = {
+    val ScalaString = classOf[String].getName
+    val IntegerString = classOf[Int].getName
+    val DoubleString = classOf[Double].getName
+    val ListString = classOf[List[_]].getName
+    val ArrayString = classOf[Array[_]].getName
+    val ObjectString = classOf[Object].getName
+    val BooleanString = classOf[Boolean].getName
+    val LongString = classOf[Long].getName
+    val InstantString = classOf[Instant].getName
+
+    if(paramType== null)
+      throw new NullPointerException("parameter type is null..")
+    else{
+      paramType.getName match {
+        case BooleanString |"boolean" => Some(paraValue)
+        case ScalaString | "java.lang.String" => Some(paraValue.toString)
+        case IntegerString | "int" => Some(paraValue.toString.toInt)
+        case DoubleString | "double" => Some(paraValue.toString.toDouble)
+        case LongString | "long" => Some(paraValue.toString.toLong)
+        case InstantString => Some(Instant.parse(paraValue.toString))
+        case ObjectString|"java.lang.Object" => Some(paraValue)
+
+        case ListString | ArrayString | "java.util.List" =>
+
+          val parsedListEither = JSON.parseFull(paraValue.toString).toRight("Value can't be parsed as List")
+
+          parsedListEither match {
+            case Right(parsed) =>
+              parsed match {
+                case value: List[_] =>
+                  Some(value)
+                case _ =>
+                  None
+              }
+
+
+        case Left(exMessage) => throw new IllegalArgumentException(exMessage)
+          }
+        case _ => throw new Error(s"Couldn't derive type: ${paramType.getName}")
+
+      }
+    }
+  }
+
+
+
+
+
+}
+
+/**
+ * OBJECT IMPLEMENTATION OF PARAMETER HERE
+ */
+
+object Parameter {
+  /**
+   * Implicit default ordering which will be used to order lists/sequences of [[Parameter]]
+   *
+   * @tparam A subclasses of [[Parameter]]
+   */
+  implicit def orderingByPosition[A <: Parameter]: Ordering[A] = {
+    Ordering.by(elem => elem.position)
+  }
+
+  def apply(paramType: Class[_], paramUri: Uri, paraValue: String, position: Int): Parameter = {
+    DefinedParameter(paramType, paramUri, Some(paraValue), position)
+  }
+
+  def apply(paramType:Class[_], paraValue:String): Parameter ={
+    DefinedParameter(paramType, Uri(""),Some(paraValue), 0)
+  }
+
+
+  def apply(paramType: Class[_], paramUri: Uri, position: Int): Parameter = {
+    EmptyParameter(paramType, paramUri, position)
+  }
+
+  def apply(paramUri: Uri, paraValue: String, position: Int): Parameter = {
+    DefinedParameter(paramUri = paramUri, paraValue = Some(paraValue), position = position)
+  }
+
+}
+
diff --git a/src/main/scala/io/rml/framework/core/function/model/std/StdRandomFunction.scala b/src/main/scala/io/rml/framework/core/function/model/std/StdRandomFunction.scala
new file mode 100644
index 00000000..de227ebe
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/model/std/StdRandomFunction.scala
@@ -0,0 +1,24 @@
+package io.rml.framework.core.function.model.std
+
+import io.rml.framework.core.function.model.Function
+import io.rml.framework.core.model.{Entity, Literal, Uri}
+import io.rml.framework.core.vocabulary.RMLVoc
+import io.rml.framework.flink.sink.FlinkRDFQuad
+
+import java.lang.reflect.Method
+import scala.util.Random
+
+case class StdRandomFunction(identifier:String = RMLVoc.Property.GREL_RANDOM) extends Function{
+  private val random = new Random()
+
+  override def execute(arguments: Map[Uri, String]): Option[Iterable[Entity]] = {
+      Some(List(Literal(random.nextString(10))))
+  }
+
+
+  override def execute(paramTriples: List[FlinkRDFQuad]): Option[Iterable[Entity]] = ???
+
+  override def getMethod: Option[Method] = {
+    None
+  }
+}
diff --git a/src/main/scala/io/rml/framework/core/function/model/std/StdUpperCaseFunction.scala b/src/main/scala/io/rml/framework/core/function/model/std/StdUpperCaseFunction.scala
new file mode 100644
index 00000000..e2a3f8f3
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/model/std/StdUpperCaseFunction.scala
@@ -0,0 +1,22 @@
+package io.rml.framework.core.function.model.std
+
+import io.rml.framework.core.function.model.Function
+import io.rml.framework.core.model.{Entity, Literal, Uri}
+import io.rml.framework.core.vocabulary.{Namespaces, RMLVoc}
+import io.rml.framework.flink.sink.FlinkRDFQuad
+
+import java.lang.reflect.Method
+
+case class StdUpperCaseFunction(identifier: String = RMLVoc.Property.GREL_UPPERCASE) extends Function {
+  override def execute(arguments: Map[Uri, String]): Option[Iterable[Entity]] = {
+    val parameter = arguments.get(Uri(Namespaces("grel", "valueParameter")))
+
+    parameter.map(string => List(Literal(string)))
+  }
+
+  override def execute(paramTriples: List[FlinkRDFQuad]): Option[Iterable[Entity]] = ???
+
+  override def getMethod: Option[Method] = {
+    None
+  }
+}
diff --git a/src/main/scala/io/rml/framework/core/function/std/StdFunctionLoader.scala b/src/main/scala/io/rml/framework/core/function/std/StdFunctionLoader.scala
new file mode 100644
index 00000000..941e24b9
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/function/std/StdFunctionLoader.scala
@@ -0,0 +1,94 @@
+package io.rml.framework.core.function.std
+
+import io.rml.framework.core.function.model.{FunctionMetaData, Parameter}
+import io.rml.framework.core.function.{FunctionLoader, FunctionUtils}
+import io.rml.framework.core.model.Uri
+import io.rml.framework.core.model.rdf.{RDFGraph, RDFNode, RDFResource}
+import io.rml.framework.core.util.Util
+import io.rml.framework.core.vocabulary.RMLVoc
+import io.rml.framework.shared.{FnOException, RMLException}
+
+
+case class StdFunctionLoader private (functionDescriptionTriplesGraph : RDFGraph) extends FunctionLoader {
+
+  override def parseFunctionMapping(graph: RDFGraph): FunctionLoader = {
+    logDebug("parsing functions the new way (i.e. using StdFunctionLoader)")
+
+    val fnoFunctionProperty = Uri(RMLVoc.Property.FNO_FUNCTION)
+
+    // subject resources with fno:function property
+    // these resources have type fnoi:Mapping
+    val mappings = graph.filterProperties(fnoFunctionProperty)
+    if(mappings.isEmpty)
+      throw new RMLException("No function mappings found...")
+
+    val functionDescriptionResources = this.functionDescriptionTriplesGraph.filterResources(Uri(RMLVoc.Class.FNO_FUNCTION))
+    logDebug(s"${functionDescriptionResources.length} functionDescriptionResources present")
+    logDebug(s"The current function description graph contains ${mappings.length} mappings")
+    for (map <- mappings) {
+      logDebug(s"Processing mapping: ${map.uri}")
+      try {
+        val functionUri = map.listProperties(RMLVoc.Property.FNO_FUNCTION).head.asInstanceOf[RDFResource].uri
+
+        val methodMappingResource = map.listProperties(RMLVoc.Property.FNO_METHOD_MAPPING).head.asInstanceOf[RDFResource]
+        val methodName = methodMappingResource.listProperties(RMLVoc.Property.FNOM_METHOD_NAME).head.toString
+        val implementationResource = map.listProperties(RMLVoc.Property.FNO_IMPLEMENTATION).head.asInstanceOf[RDFResource]
+
+        val className = Util.getLiteral(implementationResource.listProperties(RMLVoc.Property.FNOI_CLASS_NAME).head)
+        val downloadPage = Util.getLiteral(implementationResource.listProperties(RMLVoc.Property.DOAP_DOWNLOAD_PAGE).head)
+        logDebug(s"Found map with methodname: ${methodName}, className: ${className}, downloadPage: ${downloadPage}")
+
+        // Get function description resource that corresponds with the current functionUri
+        // If not present, throw appropriate exception
+        val functionDescriptionResourceOption = functionDescriptionResources.find(fd => fd.uri == functionUri)
+        if(functionDescriptionResourceOption.isEmpty)
+          throw new FnOException(s"No function description resource found with uri: ${functionUri}")
+
+
+        // extraction of input parameters
+        val expectsResource = functionDescriptionResourceOption.get.listProperties(RMLVoc.Property.FNO_EXPECTS).headOption
+        val inputParameterResources = expectsResource.get.asInstanceOf[RDFResource].getList.asInstanceOf[List[RDFResource]]
+        val inputParamList = parseParameterResources(inputParameterResources)
+
+        // extraction of output parameters
+        val returnsResource = functionDescriptionResourceOption.get.listProperties(RMLVoc.Property.FNO_RETURNS).headOption
+        val outputParameterResources = returnsResource.get.asInstanceOf[RDFResource].getList.asInstanceOf[List[RDFResource]]
+        val outputParamList = parseParameterResources(outputParameterResources)
+
+        // construct function meta data object and store it in the functionMap
+        val functionMetaData = FunctionMetaData(downloadPage.get.value, className.get.value, methodName, inputParamList, outputParamList)
+        this.functionMap.put(functionUri, functionMetaData)
+
+      }catch {
+        case e@(_: RMLException | _: FnOException) =>
+          logError(e.getMessage)
+      }
+    }
+    this
+  }
+
+
+  def parseParameterResources(parameterResources : List[RDFResource]) : List[Parameter] = {
+    parameterResources.zipWithIndex.map{
+      case (paramResource, paramIndex) =>
+        parseParameter(paramResource, paramIndex)
+    }
+  }
+
+  override def parseParameter(inputNode: RDFNode, pos: Int): Parameter = {
+    val inputResource = inputNode.asInstanceOf[RDFResource]
+    val paramType = inputResource.listProperties(RMLVoc.Property.FNO_TYPE).headOption
+    val paramUri = inputResource.listProperties(RMLVoc.Property.FNO_PREDICATE).headOption
+
+
+    if(paramType.isEmpty)
+      throw new FnOException(s"Parameter Type not defined for parameter resource: ${inputResource.uri}")
+
+    if(paramUri.isEmpty)
+      throw new FnOException(s"Parameter Uri not defined for parameter resource: ${inputResource.uri}")
+
+
+    val typeClass = FunctionUtils.getTypeClass(Uri(paramType.get.toString))
+    Parameter(typeClass, Uri(paramUri.get.toString), pos)
+  }
+}
diff --git a/src/main/scala/io/rml/framework/core/internal/Logging.scala b/src/main/scala/io/rml/framework/core/internal/Logging.scala
index 5bdf4038..097ca8a7 100644
--- a/src/main/scala/io/rml/framework/core/internal/Logging.scala
+++ b/src/main/scala/io/rml/framework/core/internal/Logging.scala
@@ -45,7 +45,7 @@ trait Logging {
 
   def logWarning(log: String): Unit = logger.warn(log)
 
-  def isDebugEnabled: Boolean = logger.isDebugEnabled
+  def isDebugEnabled: Boolean = logger.isDebugEnabled()
 
   def isWarnEnabled: Boolean = logger.isWarnEnabled()
 
diff --git a/src/main/scala/io/rml/framework/core/model/FileDataSource.scala b/src/main/scala/io/rml/framework/core/model/FileDataSource.scala
index 16ff960e..835453c1 100644
--- a/src/main/scala/io/rml/framework/core/model/FileDataSource.scala
+++ b/src/main/scala/io/rml/framework/core/model/FileDataSource.scala
@@ -25,12 +25,15 @@
 
 package io.rml.framework.core.model
 
-import java.io.File
-
+import io.rml.framework.api.RMLEnvironment
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model.std.StdFileDataSource
+import io.rml.framework.core.util.Util
 import io.rml.framework.shared.RMLException
 
+import java.io.File
+import scala.util.{Failure, Success, Try}
+
 /**
   *
   */
@@ -49,15 +52,23 @@ object FileDataSource extends Logging {
     */
   def apply(uri: ExplicitNode): DataSource = {
     val file = new File(uri.toString)
-    if (file.isAbsolute) {
-      logDebug(Uri(file.getAbsolutePath).uri)
-      StdFileDataSource(Uri(file.getAbsolutePath))
-    } else {
-      val url = ClassLoader.getSystemResource(uri.toString)
-      if (url == null) throw new RMLException(uri.toString + " can't be found.")
-      val file_2 = new File(url.toURI)
-      StdFileDataSource(Uri(file_2.getAbsolutePath))
+    Try(Util.resolveFileRelativeToSourceFileParent(RMLEnvironment.getMappingFileBaseIRI().get, file.getPath)) match {
+      case Success(resolvedFile) => {
+        StdFileDataSource(Uri(resolvedFile.getAbsolutePath))
+      }
+      case Failure(exception) => {
+        if (file.isAbsolute) {
+          logDebug(Uri(file.getAbsolutePath).uri)
+          StdFileDataSource(Uri(file.getAbsolutePath))
+        } else {
+          val url = ClassLoader.getSystemResource(uri.toString)
+          if (url == null) throw new RMLException(uri.toString + " can't be found.")
+          val file_2 = new File(url.toURI)
+          StdFileDataSource(Uri(file_2.getAbsolutePath))
+        }
+      }
     }
+
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/core/model/FormattedRMLMapping.scala b/src/main/scala/io/rml/framework/core/model/FormattedRMLMapping.scala
index 1fcbb3f1..03f0c6a5 100644
--- a/src/main/scala/io/rml/framework/core/model/FormattedRMLMapping.scala
+++ b/src/main/scala/io/rml/framework/core/model/FormattedRMLMapping.scala
@@ -135,7 +135,7 @@ object FormattedRMLMapping {
 
       // create new poms from these grouped poms by parent triple maps
       .flatMap(item => {
-      item._2.map(item => PredicateObjectMap(item._1.identifier, List(item._2), item._1.functionMaps, item._1.predicateMaps, item._1.graphMap))
+      item._2.map(item => PredicateObjectMap(item._1.identifier, List(item._2),  item._1.predicateMaps, item._1.graphMap))
     })
     // every new pom will have exactly one parent triple map, create a JoinedTriplesMap from these poms
     newPoms.map(pom => {
@@ -157,7 +157,7 @@ object FormattedRMLMapping {
       .filter(item => item._1.isEmpty)
       .flatMap(item => {
         item._2.map(item => {
-          PredicateObjectMap(item._1.identifier, List(item._2), item._1.functionMaps, item._1.predicateMaps,item._1.graphMap)
+          PredicateObjectMap(item._1.identifier, List(item._2), item._1.predicateMaps,item._1.graphMap)
         })
       })
     TriplesMap(newPoms.toList, triplesMap.logicalSource, triplesMap.subjectMap, triplesMap.identifier)
diff --git a/src/main/scala/io/rml/framework/core/model/FunctionMap.scala b/src/main/scala/io/rml/framework/core/model/FunctionMap.scala
index 8e510845..e2fa8550 100644
--- a/src/main/scala/io/rml/framework/core/model/FunctionMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/FunctionMap.scala
@@ -24,7 +24,8 @@
   **/
 package io.rml.framework.core.model
 
-case class FunctionMap(identifier: String, functionValue: TriplesMap) extends TermMap {
+case class FunctionMap(parentMap : String, identifier: String, functionValue: List[PredicateObjectMap]) extends TermMap {
+
 
   /**
     *
diff --git a/src/main/scala/io/rml/framework/core/model/GraphMap.scala b/src/main/scala/io/rml/framework/core/model/GraphMap.scala
index 25ce4c96..a992a342 100644
--- a/src/main/scala/io/rml/framework/core/model/GraphMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/GraphMap.scala
@@ -41,8 +41,9 @@ trait GraphMap extends TermMap
 
 object GraphMap {
   def apply(identifier: String,
+            functionMap: List[FunctionMap],
             constant: Option[Entity],
             reference: Option[Literal],
             template: Option[Literal],
-            termType: Option[Uri]): GraphMap = StdGraphMap(identifier, constant, reference, template)
+            termType: Option[Uri]): GraphMap = StdGraphMap(identifier, functionMap, constant, reference, template)
 }
diff --git a/src/main/scala/io/rml/framework/core/model/JoinedTriplesMap.scala b/src/main/scala/io/rml/framework/core/model/JoinedTriplesMap.scala
index a9f66ba9..e8c21544 100644
--- a/src/main/scala/io/rml/framework/core/model/JoinedTriplesMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/JoinedTriplesMap.scala
@@ -29,7 +29,7 @@ import io.rml.framework.shared.RMLException
 
 abstract class JoinedTriplesMap(triplesMap: TriplesMap) extends TriplesMap {
 
-  private val parentTriplesMaps: List[TriplesMap] = triplesMap.predicateObjectMaps.flatMap(pom => {
+  private val parentTriplesMaps: List[String] = triplesMap.predicateObjectMaps.flatMap(pom => {
     pom.objectMaps.flatMap(om => {
       om.parentTriplesMap
     })
@@ -50,7 +50,7 @@ abstract class JoinedTriplesMap(triplesMap: TriplesMap) extends TriplesMap {
   if (joinConditions.exists(_ != joinConditions.head)) throw new RMLException(triplesMap.identifier +
     ": Can only create JoinedTripleMap from triple map with one general join condition.")
 
-  val parentTriplesMap: TriplesMap = parentTriplesMaps.head
+  val parentTriplesMap: String = parentTriplesMaps.head
   val joinCondition: Option[JoinCondition] = joinConditions.headOption
 
 }
diff --git a/src/main/scala/io/rml/framework/core/model/ObjectMap.scala b/src/main/scala/io/rml/framework/core/model/ObjectMap.scala
index 4c5b981d..a98b9d2b 100644
--- a/src/main/scala/io/rml/framework/core/model/ObjectMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/ObjectMap.scala
@@ -38,7 +38,7 @@ trait ObjectMap extends TermMap {
 
   def joinCondition: Option[JoinCondition]
 
-  def parentTriplesMap: Option[TriplesMap]
+  def parentTriplesMap: Option[String]
 
 }
 
@@ -46,16 +46,18 @@ case class JoinCondition(child: Literal, parent: Literal) // TODO: make this a t
 
 object ObjectMap {
   def apply(identifier: String,
+            functionMap: List[FunctionMap] = List(),
             constant: Option[Entity] = None,
             reference: Option[Literal] = None,
             template: Option[Literal] = None,
             termType: Option[Uri] = None,
             datatype: Option[Uri] = None,
             language: Option[Literal] = None,
-            parentTriplesMap: Option[TriplesMap] = None,
+            parentTriplesMap: Option[String] = None,
             joinCondition: Option[JoinCondition] = None): ObjectMap =
 
     StdObjectMap(identifier,
+      functionMap,
       constant,
       reference,
       template,
diff --git a/src/main/scala/io/rml/framework/core/model/PredicateMap.scala b/src/main/scala/io/rml/framework/core/model/PredicateMap.scala
index 14a4cb5b..6fd3e323 100644
--- a/src/main/scala/io/rml/framework/core/model/PredicateMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/PredicateMap.scala
@@ -39,12 +39,14 @@ trait PredicateMap extends TermMap
 
 object PredicateMap {
   def apply(identifier: String,
+            functionMap: List[FunctionMap] = List(),
             constant: Option[Entity] = None,
             reference: Option[Literal] = None,
             template: Option[Literal] = None,
             termType: Option[Uri] = None): PredicateMap =
 
     StdPredicateMap(identifier,
+      functionMap,
       constant,
       reference,
       template,
diff --git a/src/main/scala/io/rml/framework/core/model/PredicateObjectMap.scala b/src/main/scala/io/rml/framework/core/model/PredicateObjectMap.scala
index 3ff332a4..f4dc257e 100644
--- a/src/main/scala/io/rml/framework/core/model/PredicateObjectMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/PredicateObjectMap.scala
@@ -43,15 +43,13 @@ import io.rml.framework.core.model.std.StdPredicateObjectMap
 trait PredicateObjectMap extends Node {
   def objectMaps: List[ObjectMap]
 
-  def functionMaps: List[FunctionMap]
-
   def predicateMaps: List[PredicateMap]
 
   def graphMap: Option[GraphMap]
 }
 
 object PredicateObjectMap {
-  def apply(identifier: String, objectMaps: List[ObjectMap], functionMaps: List[FunctionMap], predicateMaps: List[PredicateMap], graphMap: Option[GraphMap]): PredicateObjectMap = {
-    StdPredicateObjectMap(identifier, objectMaps, functionMaps, predicateMaps, graphMap)
+  def apply(identifier: String, objectMaps: List[ObjectMap], predicateMaps: List[PredicateMap], graphMap: Option[GraphMap]): PredicateObjectMap = {
+    StdPredicateObjectMap(identifier, objectMaps, predicateMaps, graphMap)
   }
 }
diff --git a/src/main/scala/io/rml/framework/core/model/RMLMapping.scala b/src/main/scala/io/rml/framework/core/model/RMLMapping.scala
index 4d09f3ad..6cea5c68 100644
--- a/src/main/scala/io/rml/framework/core/model/RMLMapping.scala
+++ b/src/main/scala/io/rml/framework/core/model/RMLMapping.scala
@@ -57,17 +57,7 @@ object RMLMapping {
     * @return
     */
   def apply(triplesMaps: List[TriplesMap], identifier: String): RMLMapping = {
-    // separating triple maps that contain parent triple maps
-    val tmWithParentTriplesMaps = triplesMaps.filter(tm => tm.containsParentTriplesMap)
-    val parentTriplesMaps = tmWithParentTriplesMaps.flatMap(tm =>
-      tm.predicateObjectMaps.flatMap(pm =>
-        pm.objectMaps.flatMap(om => om.parentTriplesMap)))
-    val transformedPTM = parentTriplesMaps.map(ParentTriplesMap(_))
-
-    // filter out all triple maps that are not parent triple maps themselves
-    val nonPTMTriplesMaps = triplesMaps.filter(tm => !transformedPTM.contains(ParentTriplesMap(tm)))
-
-    StdRMLMapping(nonPTMTriplesMaps, identifier)
+    StdRMLMapping(triplesMaps, identifier)
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/core/model/StreamTriplesMap.scala b/src/main/scala/io/rml/framework/core/model/StreamTriplesMap.scala
index 735db51e..accd081e 100644
--- a/src/main/scala/io/rml/framework/core/model/StreamTriplesMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/StreamTriplesMap.scala
@@ -61,7 +61,7 @@ abstract class StreamTriplesMap(triplesMap: TriplesMap) extends TriplesMap {
     *
     * @return
     */
-  override def graphMap = ???
+  override def graphMap = triplesMap.graphMap
 
 }
 
diff --git a/src/main/scala/io/rml/framework/core/model/SubjectMap.scala b/src/main/scala/io/rml/framework/core/model/SubjectMap.scala
index 9cbc4342..14e66360 100644
--- a/src/main/scala/io/rml/framework/core/model/SubjectMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/SubjectMap.scala
@@ -59,13 +59,14 @@ object SubjectMap {
     */
   def apply(identifier: String,
             `class`: List[Uri],
+            functionMap: List[FunctionMap],
             constant: Option[Entity],
             reference: Option[Literal],
             template: Option[Literal],
             termType: Option[Uri],
             graphMap: Option[GraphMap]): SubjectMap = {
 
-    StdSubjectMap(identifier, `class`, constant, reference, template, termType, graphMap)
+    StdSubjectMap(identifier, `class`, functionMap, constant, reference, template, termType, graphMap)
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/core/model/TCPSocketStream.scala b/src/main/scala/io/rml/framework/core/model/TCPSocketStream.scala
index eb22bba6..dced720f 100644
--- a/src/main/scala/io/rml/framework/core/model/TCPSocketStream.scala
+++ b/src/main/scala/io/rml/framework/core/model/TCPSocketStream.scala
@@ -26,19 +26,12 @@ package io.rml.framework.core.model
 
 import java.util.Objects
 
-case class TCPSocketStream(hostName: String, port: Int, _type: String) extends StreamDataSource {
+case class TCPSocketStream(hostName: String, port: Int) extends StreamDataSource {
   override def uri: ExplicitNode = {
-    val hashValue = Objects.hash(hostName, Integer.valueOf(port), _type)
+    val hashValue = Objects.hash(hostName, Integer.valueOf(port))
 
     Uri(hashValue.toHexString)
   }
 }
 
-object TCPSocketStream {
-
-  object TYPE {
-    val PUSH = "PUSH"
-    val PULL = "PULL"
-  }
-
-}
+//object TCPSocketStream
diff --git a/src/main/scala/io/rml/framework/core/model/TermMap.scala b/src/main/scala/io/rml/framework/core/model/TermMap.scala
index 9d47e11a..1d0f6785 100644
--- a/src/main/scala/io/rml/framework/core/model/TermMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/TermMap.scala
@@ -44,6 +44,7 @@ package io.rml.framework.core.model
   */
 trait TermMap extends Node {
 
+  def functionMap: List[FunctionMap]= List()
 
   /**
     *
@@ -87,6 +88,7 @@ trait TermMap extends Node {
     */
   def hasConstant: Boolean = constant.isDefined
 
+  def hasFunctionMap:Boolean = functionMap.nonEmpty
   /**
     *
     * @return
diff --git a/src/main/scala/io/rml/framework/core/model/rdf/RDFResource.scala b/src/main/scala/io/rml/framework/core/model/rdf/RDFResource.scala
index db427f92..864db05a 100644
--- a/src/main/scala/io/rml/framework/core/model/rdf/RDFResource.scala
+++ b/src/main/scala/io/rml/framework/core/model/rdf/RDFResource.scala
@@ -25,13 +25,14 @@
 
 package io.rml.framework.core.model.rdf
 
+import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model.Uri
 
 /**
   * This trait represents a resource that is able to query an underlying RDF model.
   * Different third-party libraries can be used by implementing implicits.
   */
-trait RDFResource extends RDFNode {
+trait RDFResource extends RDFNode with Logging {
 
 
   def uri: Uri
@@ -43,6 +44,9 @@ trait RDFResource extends RDFNode {
 
   def getType: Option[Uri]
 
+
+  def getList: List[RDFNode]
+
   /**
     *
     * @param property
diff --git a/src/main/scala/io/rml/framework/core/model/rdf/jena/JenaResource.scala b/src/main/scala/io/rml/framework/core/model/rdf/jena/JenaResource.scala
index 86ea3db6..1f1e7141 100644
--- a/src/main/scala/io/rml/framework/core/model/rdf/jena/JenaResource.scala
+++ b/src/main/scala/io/rml/framework/core/model/rdf/jena/JenaResource.scala
@@ -29,7 +29,7 @@ import io.rml.framework.core.model.Uri
 import io.rml.framework.core.model.rdf.{RDFLiteral, RDFNode, RDFResource}
 import io.rml.framework.core.vocabulary.RDFVoc
 import org.apache.commons.lang3.builder.HashCodeBuilder
-import org.apache.jena.rdf.model.Resource
+import org.apache.jena.rdf.model.{RDFList, Resource}
 
 import scala.collection.JavaConverters._
 
@@ -117,17 +117,35 @@ class JenaResource(val resource: Resource) extends RDFResource {
 
   override def getType: Option[Uri] = {
     val types: Seq[RDFNode] = listProperties(RDFVoc.Property.TYPE)
-    // check if there are type statements, or else return None
-    if (types.size != 1) return None
-    // if there is a type statement, make sure this is a Resource and that there is only one in total
-    require(types.head.isInstanceOf[RDFResource], "Type must be a resource.")
-
-    // TODO: what if there are multiple types?
+    types.size match {
+      case 0 => {
+        // no type defined
+        this.logWarning("No rdf:type defined for resource.")
+        None
+      }
+      case 1 => {
+        require(types.head.isInstanceOf[RDFResource], "Type must be a resource.")
+        Some(types.head.asInstanceOf[RDFResource].uri)
+      }
+      case _ => {
+        // multiple types defined...
+        // TODO: what if there are multiple types?
+        this.logWarning("Multiple rdf:types defined for resource.")
+        None
+      }
+    }
 
-    Some(types.head.asInstanceOf[RDFResource].uri)
   }
 
+  override def getList: List[RDFNode] = {
+    try {
+      val list = resource.as(classOf[RDFList]).asJavaList()
+      list.asScala.toList.map(JenaNode(_))
+    } catch {
+      case _: Exception => List(JenaNode(resource))
+    }
 
+  }
 }
 
 object JenaResource {
diff --git a/src/main/scala/io/rml/framework/core/model/std/StdGraphMap.scala b/src/main/scala/io/rml/framework/core/model/std/StdGraphMap.scala
index 74cbfc2e..b323e6fa 100644
--- a/src/main/scala/io/rml/framework/core/model/std/StdGraphMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/std/StdGraphMap.scala
@@ -28,6 +28,7 @@ import io.rml.framework.core.model._
 import io.rml.framework.core.vocabulary.RMLVoc
 
 case class StdGraphMap(identifier: String,
+                       override val functionMap:List[FunctionMap],
                        constant: Option[Entity],
                        reference: Option[Literal],
                        template: Option[Literal]) extends GraphMap {
diff --git a/src/main/scala/io/rml/framework/core/model/std/StdObjectMap.scala b/src/main/scala/io/rml/framework/core/model/std/StdObjectMap.scala
index 01c35f4f..7ca6fd4a 100644
--- a/src/main/scala/io/rml/framework/core/model/std/StdObjectMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/std/StdObjectMap.scala
@@ -27,11 +27,12 @@ package io.rml.framework.core.model.std
 import io.rml.framework.core.model._
 
 case class StdObjectMap(identifier: String,
+                        override val functionMap: List[FunctionMap],
                         constant: Option[Entity],
                         reference: Option[Literal],
                         template: Option[Literal],
                         termType: Option[Uri],
                         override val datatype: Option[Uri],
                         override val language: Option[Literal],
-                        parentTriplesMap: Option[TriplesMap],
+                        parentTriplesMap: Option[String],
                         joinCondition: Option[JoinCondition]) extends ObjectMap
diff --git a/src/main/scala/io/rml/framework/core/model/std/StdPredicateMap.scala b/src/main/scala/io/rml/framework/core/model/std/StdPredicateMap.scala
index 35b7742a..7a858b08 100644
--- a/src/main/scala/io/rml/framework/core/model/std/StdPredicateMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/std/StdPredicateMap.scala
@@ -28,6 +28,7 @@ package io.rml.framework.core.model.std
 import io.rml.framework.core.model._
 
 case class StdPredicateMap(identifier: String,
+                           override val functionMap: List[FunctionMap],
                            constant: Option[Entity],
                            reference: Option[Literal],
                            template: Option[Literal],
diff --git a/src/main/scala/io/rml/framework/core/model/std/StdPredicateObjectMap.scala b/src/main/scala/io/rml/framework/core/model/std/StdPredicateObjectMap.scala
index 56529ae7..7352e23c 100644
--- a/src/main/scala/io/rml/framework/core/model/std/StdPredicateObjectMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/std/StdPredicateObjectMap.scala
@@ -29,7 +29,6 @@ import io.rml.framework.core.model._
 
 case class StdPredicateObjectMap(identifier: String,
                                  objectMaps: List[ObjectMap],
-                                 functionMaps: List[FunctionMap],
                                  predicateMaps: List[PredicateMap],
                                  graphMap: Option[GraphMap])
 
diff --git a/src/main/scala/io/rml/framework/core/model/std/StdSubjectMap.scala b/src/main/scala/io/rml/framework/core/model/std/StdSubjectMap.scala
index d00c5a86..9583aba0 100644
--- a/src/main/scala/io/rml/framework/core/model/std/StdSubjectMap.scala
+++ b/src/main/scala/io/rml/framework/core/model/std/StdSubjectMap.scala
@@ -29,6 +29,7 @@ import io.rml.framework.core.model._
 
 case class StdSubjectMap(identifier: String,
                          `class`: List[Uri],
+                         override val functionMap:List[FunctionMap],
                          constant: Option[Entity],
                          reference: Option[Literal],
                          template: Option[Literal],
diff --git a/src/main/scala/io/rml/framework/core/util/JenaUtil.scala b/src/main/scala/io/rml/framework/core/util/JenaUtil.scala
index a0f7396e..5487127d 100644
--- a/src/main/scala/io/rml/framework/core/util/JenaUtil.scala
+++ b/src/main/scala/io/rml/framework/core/util/JenaUtil.scala
@@ -25,13 +25,13 @@
 
 package io.rml.framework.core.util
 
-import java.io.ByteArrayOutputStream
-import java.nio.charset.StandardCharsets
-
+import io.rml.framework.core.model.rdf.{RDFNode, RDFResource}
 import org.apache.jena.query.{Dataset, DatasetFactory}
 import org.apache.jena.rdf.model.Model
 import org.apache.jena.riot.{Lang, RDFFormat, RDFParser}
 
+import java.io.ByteArrayOutputStream
+import java.nio.charset.StandardCharsets
 import scala.collection.mutable
 
 
@@ -46,6 +46,14 @@ object JenaUtil {
     }
   }
 
+  def parseListNodes(rdf: RDFResource, property:String): List[(RDFNode, Int)] = {
+    rdf.listProperties(property)
+      .head
+      .asInstanceOf[RDFResource]
+      .getList
+      .zipWithIndex
+  }
+
   def toRDFFormat(format: Format): RDFFormat = {
     format match {
       case Turtle => RDFFormat.TURTLE
diff --git a/src/main/scala/io/rml/framework/core/util/Util.scala b/src/main/scala/io/rml/framework/core/util/Util.scala
index 016098a3..7fda10e7 100644
--- a/src/main/scala/io/rml/framework/core/util/Util.scala
+++ b/src/main/scala/io/rml/framework/core/util/Util.scala
@@ -24,27 +24,35 @@
   **/
 package io.rml.framework.core.util
 
-import java.io.{ByteArrayInputStream, File, FileInputStream, InputStream}
+import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.extractors.MappingReader
+import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.model.{FormattedRMLMapping, Literal, Node, RMLMapping}
+import io.rml.framework.shared.ReadException
+
+import java.io._
 import java.net.URI
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Paths}
 import java.util.regex.Pattern
-
-import io.rml.framework.core.extractors.MappingReader
-import io.rml.framework.core.model.FormattedRMLMapping
-import io.rml.framework.shared.ReadException
-
 import scala.collection.mutable.ListBuffer
 import scala.io.Source
+import scala.util.{Failure, Success, Try}
 
 
-object Util {
+object Util extends Logging{
 
   // Without support for custom registered languages of length 5-8 of the IANA language-subtag-registry
   private val regexPatternLanguageTag = Pattern.compile("^((?:(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?:([A-Za-z]{2,3}(-(?:[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4})(-(?:[A-Za-z]{4}))?(-(?:[A-Za-z]{2}|[0-9]{3}))?(-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-(?:[0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(?:x(-[A-Za-z0-9]{1,8})+))?)|(?:x(-[A-Za-z0-9]{1,8})+))$")
 
   private val baseDirectiveCapture = "@base <([^<>]*)>.*".r
 
+  def getLiteral(node: Node):Option[Literal]= {
+    node match{
+      case lit:Literal => Some(lit)
+      case _ => None
+    }
+  }
 
   /**
     * Check if conforming to https://tools.ietf.org/html/bcp47#section-2.2.9
@@ -183,14 +191,26 @@ object Util {
     * @return
     */
   def readMappingFile(path: String): FormattedRMLMapping = {
-    val mappingFile = getFile(path)
-    val mapping = MappingReader().read(mappingFile)
+    val mappingFile = getFile(path);
+    RMLEnvironment.setMappingFileBaseIRI(Some(mappingFile.getCanonicalPath))
+    val mapping = MappingReader().read(mappingFile).asInstanceOf[RMLMapping];
     FormattedRMLMapping.fromRMLMapping(mapping)
   }
 
+  private def getFileUsingClassLoader(path : String) = {
+    val classLoader = getClass.getClassLoader
+    new File(classLoader.getResource(path).getFile)
+  }
+  private def getFileRelativeToUserDir(path : String) = {
+    val userDir = System.getProperty("user.dir")
+    resolveFileRelativeToSourceFileParent(userDir,path)
+  }
   /**
     * If the given path is absolute, then a File object representing that path is returned.
-    * If the given path is relative, then a File object representing the path relative to the root class directory is returned. This can also be a path in a jar.
+    * If the given path is relative, then the following steps are taken to find the file
+   *  - 1. using the classloader (a File object representing the path relative to the root class directory is returned.
+   *  This can also be a path in a jar.)
+   *  - 2. try to find the file relative to the user directory
     * @param path
     * @return
     */
@@ -199,11 +219,43 @@ object Util {
     val result = if (file_1.isAbsolute) {
       new File(path)
     } else {
-      println(path)
-      val classLoader = getClass.getClassLoader
-      new File(classLoader.getResource(path).getFile)
+      // Try to find the file use the class loader
+      val out = Try(getFileUsingClassLoader(path)) match {
+        case Success(file) => Some(file)
+        case Failure(exception) => {
+          logWarning(s"can't find file $path using class loader")
+          // Try to find the file relative to the user directory
+          Try(getFileRelativeToUserDir(path)) match {
+            case Success(file) =>  Some(file)
+            case Failure(exception) => {
+              logWarning(s"can't find file $path relative to working dir")
+              None
+            }
+          }
+        }
+      }
+      out.getOrElse(
+       throw new FileNotFoundException(s"Unable to find ${path}")
+      )
+
     }
     result
   }
 
+
+  def resolveFileRelativeToSourceFileParent(sourcePathString: String, other : String) = {
+    val sourcePath = Paths.get(sourcePathString)
+
+    val resolved = if (sourcePath.toFile.isDirectory) {
+      sourcePath.resolve(other)
+    } else {
+      sourcePath.resolveSibling(other)
+    };
+
+    resolved.toFile
+      .getCanonicalFile
+  }
+
+
+
 }
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/Namespaces.scala b/src/main/scala/io/rml/framework/core/vocabulary/Namespaces.scala
index a7ce752c..7fbec062 100644
--- a/src/main/scala/io/rml/framework/core/vocabulary/Namespaces.scala
+++ b/src/main/scala/io/rml/framework/core/vocabulary/Namespaces.scala
@@ -38,7 +38,16 @@ object Namespaces {
     "rml" -> "http://semweb.mmlab.be/ns/rml#",
     "rmls" -> "http://semweb.mmlab.be/ns/rmls#",
     "fnml" -> "http://semweb.mmlab.be/ns/fnml#",
-    "fno" -> "http://w3id.org/function/ontology#"
+
+    "fno" -> "https://w3id.org/function/ontology#",
+    "fnom" -> "https://w3id.org/function/vocabulary/mapping#",
+    "fnoi" -> "https://w3id.org/function/vocabulary/implementation#",
+
+    "grel" -> "http://users.ugent.be/~bjdmeest/function/grel.ttl#",
+    "lib" -> "http://example.com/library#",
+    "xsd" -> "http://www.w3.org/2001/XMLSchema#",
+
+    "doap" -> "http://usefulinc.com/ns/doap#"
   )
 
   /**
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala b/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala
index 2b7eb90d..0008f65f 100644
--- a/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala
+++ b/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala
@@ -30,6 +30,22 @@ package io.rml.framework.core.vocabulary
   */
 object RMLVoc {
 
+  object Type {
+    val XSD_STRING = Namespaces("xsd", "string")
+    val XSD_INT = Namespaces("xsd", "int")         // signed 32-bit integer
+    val XSD_INTEGER = Namespaces("xsd", "integer") // integer value
+    val XSD_DOUBLE = Namespaces("xsd", "double")
+    val XSD_LONG = Namespaces("xsd", "long")
+    val RDF_LIST = Namespaces("rdf", "List")
+    val XSD_POSITIVE_INTEGER = Namespaces("xsd", "positiveInteger")
+    val XSD_BOOLEAN = Namespaces("xsd", "boolean")
+    val XSD_DATETIME = Namespaces("xsd", "dateTime")
+
+    val XSD_ANY  = Namespaces("xsd", "any")
+    val RDF_OBJECT = Namespaces("rdf", "object")
+
+  }
+
   object Property {
 
     ///////////////////////////////////////////////////////////////////////////
@@ -42,6 +58,7 @@ object RMLVoc {
     val OBJECTMAP = Namespaces("rr", "objectMap")
     val TRIPLESMAP = Namespaces("rr", "triplesMap")
     val SUBJECTMAP = Namespaces("rr", "subjectMap")
+    val SUBJECT = Namespaces("rr", "subject")
     val CONSTANT = Namespaces("rr", "constant")
     val TEMPLATE = Namespaces("rr", "template")
     val TERMTYPE = Namespaces("rr", "termType")
@@ -72,7 +89,6 @@ object RMLVoc {
     val HOSTNAME = Namespaces("rmls", "hostName")
     val PORT = Namespaces("rmls", "port")
     val PATH = Namespaces("rmls", "path")
-    val TYPE = Namespaces("rmls", "type")
 
     ///////////////////////////////////////////////////////////////////////////
     // RMLS: Kafka Source
@@ -84,6 +100,13 @@ object RMLVoc {
     val KAFKAVERSION= Namespaces("rmls", "kafkaVersion")
 
 
+    ///////////////////////////////////////////////////////////////////////////
+    // GREL
+    ///////////////////////////////////////////////////////////////////////////
+    val GREL_RANDOM = Namespaces("grel", "random")
+    val GREL_UPPERCASE = Namespaces("grel", "toUpperCase")
+
+
     ///////////////////////////////////////////////////////////////////////////
     // FNML
     ///////////////////////////////////////////////////////////////////////////
@@ -95,6 +118,48 @@ object RMLVoc {
     ///////////////////////////////////////////////////////////////////////////
 
     val EXECUTES = Namespaces("fno", "executes")
+    val FNO_SOLVES = Namespaces("fno", "solves")
+    val FNO_IMPLEMENTS = Namespaces("fno", "implements")
+    val FNO_PREDICATE = Namespaces("fno", "predicate")
+    val FNO_EXPECTS = Namespaces("fno", "expects")
+    val FNO_RETURNS = Namespaces("fno", "returns")
+    val FNO_TYPE = Namespaces("fno", "type")
+
+    val FNO_IMPLEMENTATION = Namespaces("fno", "implementation")
+
+    val FNO_FUNCTION = Namespaces("fno", "function")
+
+    val FNO_METHOD_MAPPING = Namespaces("fno", "methodMapping")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // LIB
+    ///////////////////////////////////////////////////////////////////////////
+
+    val LIB_PROVIDED_BY = Namespaces("lib", "providedBy")
+    val LIB_CLASS = Namespaces("lib", "class")
+    val LIB_METHOD = Namespaces("lib", "method")
+    val LIB_LOCAL_LIBRARY = Namespaces("lib", "localLibrary")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // FNOM(apping)
+    ///////////////////////////////////////////////////////////////////////////
+
+    val FNOM_METHOD_NAME = Namespaces("fnom", "method-name")
+
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // FNOI
+    ///////////////////////////////////////////////////////////////////////////
+    val FNOI_CLASS_NAME = Namespaces("fnoi", "class-name")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // DOAP
+    ///////////////////////////////////////////////////////////////////////////
+
+    val DOAP_DOWNLOAD_PAGE = Namespaces("doap", "download-page")
+
+
 
   }
 
@@ -132,6 +197,31 @@ object RMLVoc {
 
     val FUNCTIONTERMMAP = Namespaces("fnml", "FunctionTermMap")
 
+    ///////////////////////////////////////////////////////////////////////////
+    // FNO
+    ///////////////////////////////////////////////////////////////////////////
+    val FNO_FUNCTION = Namespaces("fno", "Function")
+    val FNO_PARAMETER = Namespaces("fno", "Parameter")
+    val FNO_EXECUTION = Namespaces("fno", "Execution")
+    val FNO_OUTPUT = Namespaces("fno", "Output")
+    val FNO_ALGORITHM = Namespaces("fno", "Algorithm")
+    val FNO_PROBLEM = Namespaces("fno", "Problem")
+
+    val FNO_MAPPING = Namespaces("fno", "Mapping")
+    val FNO_METHOD_MAPPING = Namespaces("fno", "MethodMapping")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // FNOI
+    ///////////////////////////////////////////////////////////////////////////
+
+    val FNOI_JAVA_CLASS = Namespaces("fnoi", "JavaClass")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // FNOM(apping)
+    ///////////////////////////////////////////////////////////////////////////
+
+    val FNOM_STRING_METHOD_MAPPING = Namespaces("fnom", "StringMethodMapping")
+
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/FunctionMapGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/FunctionMapGeneratorAssembler.scala
index d4fb282c..af021dc5 100644
--- a/src/main/scala/io/rml/framework/engine/statement/FunctionMapGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/FunctionMapGeneratorAssembler.scala
@@ -24,39 +24,106 @@
  **/
 package io.rml.framework.engine.statement
 
-import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.function.FunctionLoader
+import io.rml.framework.core.function.model.Function
 import io.rml.framework.core.model._
 import io.rml.framework.core.vocabulary.RMLVoc
 import io.rml.framework.flink.item.Item
 import io.rml.framework.flink.sink.FlinkRDFQuad
+import io.rml.framework.flink.source.EmptyItem
+import io.rml.framework.shared.RMLException
 
 case class FunctionMapGeneratorAssembler() extends TermMapGeneratorAssembler {
 
+
   override def assemble(termMap: TermMap): (Item) => Option[Iterable[Entity]] = {
     require(termMap.isInstanceOf[FunctionMap], "Wrong TermMap instance.")
 
     val functionMap = termMap.asInstanceOf[FunctionMap]
-    val functionEngine = StatementEngine.fromTriplesMaps(List(functionMap.functionValue))
+    val pomAssembler = PredicateObjectGeneratorAssembler()
+
+    val assembledPom = functionMap.functionValue.sortBy(_.identifier) // sortBy required for retaining correct parameter ordering
+      .flatMap(pomAssembler.assemble)
+      .map {
+        case (predicateGen, objGen, _) => (predicateGen, objGen)
+      }
+
+    val function = parseFunction(assembledPom)
+
+    createAssemblerFunction(function, assembledPom)
+  }
+
+  private def parseFunction(assembledPom:
+                            List[(Item => Option[Iterable[Uri]], Item => Option[Iterable[Entity]])]): Option[Function] = {
+
+    this.logDebug("parseFunction (assembledPom)")
+    val placeHolder: List[FlinkRDFQuad] = generateFunctionTriples(new EmptyItem(), assembledPom)
+
+    val executeProperties = placeHolder.filter( quad => quad.predicate.value == Uri(RMLVoc.Property.EXECUTES))
+    if(executeProperties.isEmpty)
+      throw new RMLException(s"Couldn't find ${RMLVoc.Property.EXECUTES} property." +
+        s"Is the namespace correct? (e.g. HTTP vs. HTTPS)")
+
+    val functionName = Uri(
+      executeProperties
+      .head
+      .`object`
+      .value
+      .toString)
+    
+
+    val functionLoaderOption = FunctionLoader();
+
+    if (functionLoaderOption.isDefined) {
+      functionLoaderOption.get.createFunction(functionName);
+    } else {
+      None
+    }
+  }
+
+  /**
+   * Generates an assembler function which takes in [[Item]] and generate
+   * entities using the function specified by the function map
+   *
+   * @param assembledPom List of predicate object generator functions
+   * @return anon function taking in [[Item]] and returns entities using the function
+   */
+  private def createAssemblerFunction(function: Option[Function], assembledPom: List[(Item => Option[Iterable[Uri]], Item => Option[Iterable[Entity]])]): Item => Option[Iterable[Entity]] = {
     (item: Item) => {
-      val triples: List[FlinkRDFQuad] = functionEngine.process(item)
-      val parameters: Map[Uri, String] = triples.filter(triple => triple.predicate.uri != Uri(RMLVoc.Property.EXECUTES))
-        .map(triple => {
-          val parameterName = triple.predicate.uri
-          val parameterValue = triple.`object`.value.toString
-          parameterName -> parameterValue
-        })
-        .toMap
-
-      val name: Uri = Uri(triples.filter(triple => triple.predicate.uri == Uri(RMLVoc.Property.EXECUTES))
-        .head.`object`.value
-        .toString)
-
-      require(RMLEnvironment.hasTransformationRegistered(name), "Transformation " + name + " is not registered.")
-      RMLEnvironment.getTransformation(name).get.execute(Parameters(parameters))
-
-      //TODO: PLACEHOLDER REMOVE THIS WHEN FUNCTION MAP IS IMPLEMENTED !!!!!
-      None  // <---- REMOVE THIS!!!!!!!!!!!!
+      val triples: List[FlinkRDFQuad] = generateFunctionTriples(item, assembledPom)
+      val paramTriples = triples.filter(triple => triple.predicate.uri != Uri(RMLVoc.Property.EXECUTES))
+
+
+      if (function.isDefined) {
+        function.get.execute(paramTriples)
+      } else {
+        None
+      }
     }
   }
 
+  /**
+   * Generate triples from which the the function can be derived from
+   * and applied to the the item
+   *
+   * @param item
+   * @return
+   */
+  private def generateFunctionTriples(item: Item, assembledPom: List[(Item => Option[Iterable[Uri]], Item => Option[Iterable[Entity]])]): List[FlinkRDFQuad] = {
+
+    val result = for{
+      (predicateGen, objGen) <- assembledPom
+      predicateIter <- predicateGen(item)
+      objIter <- objGen(item)
+    } yield for {
+      predicate <- predicateIter
+      obj <- objIter
+      quad <-  Statement.generateQuad(Blank(), predicate, obj)
+    } yield quad
+
+
+    result.flatten
+
+  }
+
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/GraphGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/GraphGeneratorAssembler.scala
index 7a8d0441..57a90805 100644
--- a/src/main/scala/io/rml/framework/engine/statement/GraphGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/GraphGeneratorAssembler.scala
@@ -38,8 +38,16 @@ class GraphGeneratorAssembler extends TermMapGeneratorAssembler {
 
 
   override def assemble(termMap: TermMap): Item => Option[Iterable[Uri]] =
+    if (termMap.hasFunctionMap) {
+      val assembled = FunctionMapGeneratorAssembler().assemble(termMap.functionMap.head)
 
+
+      assembled.andThen(result => {
+        result.map(iter => iter.map(elem => Uri(elem.toString)))
+      })
+    } else {
     super.assemble(termMap).asInstanceOf[(Item) => Option[Iterable[Uri]]]
+    }
 
 
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/ObjectGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/ObjectGeneratorAssembler.scala
index 8b0c9d78..e5751940 100644
--- a/src/main/scala/io/rml/framework/engine/statement/ObjectGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/ObjectGeneratorAssembler.scala
@@ -25,7 +25,9 @@
 
 package io.rml.framework.engine.statement
 
-import io.rml.framework.core.model.{Entity, ObjectMap}
+import io.rml.framework.core.extractors.TriplesMapsCache
+import io.rml.framework.core.model.{Entity, Literal, ObjectMap, Uri}
+import io.rml.framework.core.vocabulary.RMLVoc
 import io.rml.framework.flink.item.Item
 
 class ObjectGeneratorAssembler extends TermMapGeneratorAssembler {
@@ -34,11 +36,31 @@ class ObjectGeneratorAssembler extends TermMapGeneratorAssembler {
 
     // check if it has a parent triple map
     if (objectMap.parentTriplesMap.isDefined) {
-      super.assemble(objectMap.parentTriplesMap.get.subjectMap)
-    } else super.assemble(objectMap)
+      super.assemble(TriplesMapsCache.get(objectMap.parentTriplesMap.get).get.subjectMap)
+    } else if (objectMap.hasFunctionMap) {
+      val assembledFunction = FunctionMapGeneratorAssembler().assemble(objectMap.functionMap.head)
+      val termTypeString = objectMap.termType.map(_.toString).getOrElse("")
+      assembledFunction.andThen(item => {
+        if (item.isDefined) {
+          termTypeString match {
+            case RMLVoc.Class.IRI => item.map(iter => iter.map(elem => Uri(elem.toString)))
+            case _ => item.map(iter => iter.flatMap(elem => {
+              Some(Literal(elem.identifier, objectMap.datatype, objectMap.language))
+            }))
+          }
+
+        } else {
+          None
+        }
+      })
+
+    } else {
+      super.assemble(objectMap)
+    }
 
   }
 
+
 }
 
 object ObjectGeneratorAssembler {
diff --git a/src/main/scala/io/rml/framework/engine/statement/PredicateGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/PredicateGeneratorAssembler.scala
index 0256fe94..3cc87f56 100644
--- a/src/main/scala/io/rml/framework/engine/statement/PredicateGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/PredicateGeneratorAssembler.scala
@@ -25,13 +25,32 @@
 
 package io.rml.framework.engine.statement
 
+import io.rml.framework.core.function.FunctionUtils
 import io.rml.framework.core.model.{TermMap, Uri}
 import io.rml.framework.flink.item.Item
 
 class PredicateGeneratorAssembler extends TermMapGeneratorAssembler {
 
   override def assemble(termMap: TermMap): (Item) => Option[Iterable[Uri]] = {
-    super.assemble(termMap).asInstanceOf[(Item) => Option[Iterable[Uri]]]
+
+    // Note: this code is very redundant to ObjectGeneratorAssembler. TODO: generalize?
+    if(termMap.hasFunctionMap){
+      val fmap = termMap.functionMap.head
+      val assembledFunction = FunctionMapGeneratorAssembler().assemble(fmap)
+      assembledFunction.andThen(item => {
+        if(item.isDefined) {
+          item.map(iter => iter.flatMap(elem => {
+            val castedResult = FunctionUtils.typeCastDataType(elem, termMap.datatype)
+            castedResult.map(v => Uri(v.toString))
+          }))
+        }else {
+          None
+        }
+      })
+    }
+    else {
+      super.assemble(termMap).asInstanceOf[(Item) => Option[Iterable[Uri]]]
+    }
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/PredicateObjectGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/PredicateObjectGeneratorAssembler.scala
index 0f3b1ab3..f71131a3 100644
--- a/src/main/scala/io/rml/framework/engine/statement/PredicateObjectGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/PredicateObjectGeneratorAssembler.scala
@@ -25,30 +25,28 @@
 
 package io.rml.framework.engine.statement
 
+import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model.{Entity, PredicateObjectMap, Uri}
 import io.rml.framework.flink.item.Item
-
 class PredicateObjectGeneratorAssembler(predicateGeneratorAssembler: PredicateGeneratorAssembler,
                                         objectGeneratorAssembler: ObjectGeneratorAssembler,
-                                        functionMapGeneratorAssembler: FunctionMapGeneratorAssembler,
-                                        graphGeneratorAssembler: GraphGeneratorAssembler) {
+                                        graphGeneratorAssembler: GraphGeneratorAssembler) extends Logging{
 
   def assemble(predicateObjectMap: PredicateObjectMap)
   : List[(Item => Option[Iterable[Uri]], Item => Option[Iterable[Entity]], Item => Option[Iterable[Uri]])] = {
 
+    this.logDebug("assemble (predicateObjectMap)")
 
+    val graphStatement = graphGeneratorAssembler.assemble(predicateObjectMap.graphMap)
     predicateObjectMap.predicateMaps.flatMap(predicateMap => {
       predicateObjectMap.objectMaps.map(objectMap => {
         (predicateGeneratorAssembler.assemble(predicateMap),
           objectGeneratorAssembler.assemble(objectMap),
-        graphGeneratorAssembler.assemble(predicateObjectMap.graphMap))
-      }) ++
-        predicateObjectMap.functionMaps.map(fnMap => {
-          (predicateGeneratorAssembler.assemble(predicateMap),
-            functionMapGeneratorAssembler.assemble(fnMap),
-          graphGeneratorAssembler.assemble(predicateObjectMap.graphMap))
-        })
+          graphStatement)
+      })
+
     })
+
   }
 }
 
@@ -57,10 +55,8 @@ object PredicateObjectGeneratorAssembler {
   def apply(
              predicateGeneratorAssembler: PredicateGeneratorAssembler = PredicateGeneratorAssembler(),
              objectGeneratorAssembler: ObjectGeneratorAssembler = ObjectGeneratorAssembler(),
-             functionMapGeneratorAssembler: FunctionMapGeneratorAssembler = FunctionMapGeneratorAssembler(),
              graphGeneratorAssembler: GraphGeneratorAssembler = GraphGeneratorAssembler())
 
   : PredicateObjectGeneratorAssembler = new PredicateObjectGeneratorAssembler(predicateGeneratorAssembler,
-    objectGeneratorAssembler,
-    functionMapGeneratorAssembler, graphGeneratorAssembler)
+    objectGeneratorAssembler, graphGeneratorAssembler)
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/StatementEngine.scala b/src/main/scala/io/rml/framework/engine/statement/StatementEngine.scala
index ab089c1f..9f613ac7 100644
--- a/src/main/scala/io/rml/framework/engine/statement/StatementEngine.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/StatementEngine.scala
@@ -76,7 +76,7 @@ object StatementEngine extends Logging {
     */
   def fromTriplesMaps(triplesMaps: List[TriplesMap]): StatementEngine[Item] = {
     // assemble the statements
-
+    this.logDebug("fromTriplesMaps(triplesMaps) - creating statement engine")
     //Group the triple maps with their iterator as the key
     val iteratorGroup = triplesMaps.groupBy(tm => {
       // here we require the triples map to have only one iterator
diff --git a/src/main/scala/io/rml/framework/engine/statement/StatementsAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/StatementsAssembler.scala
index 287eb92c..33568837 100644
--- a/src/main/scala/io/rml/framework/engine/statement/StatementsAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/StatementsAssembler.scala
@@ -25,16 +25,18 @@
 
 package io.rml.framework.engine.statement
 
+import io.rml.framework.core.extractors.TriplesMapsCache
+import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.model._
 import io.rml.framework.core.vocabulary.RDFVoc
 import io.rml.framework.flink.item.{Item, JoinedItem}
-
 /**
   * Creates statements from triple maps.
   */
 class StatementsAssembler(subjectAssembler: SubjectGeneratorAssembler = SubjectGeneratorAssembler(),
                           predicateObjectAssembler: PredicateObjectGeneratorAssembler = PredicateObjectGeneratorAssembler(),
-                          graphAssembler: GraphGeneratorAssembler = GraphGeneratorAssembler()) {
+                          graphAssembler: GraphGeneratorAssembler = GraphGeneratorAssembler())
+extends Logging{
 
   /**
     * Creates statements from a triple map.
@@ -43,6 +45,7 @@ class StatementsAssembler(subjectAssembler: SubjectGeneratorAssembler = SubjectG
     * @return
     */
   def assembleStatements(triplesMap: TriplesMap): List[(Item => Option[Iterable[TermNode]], Item => Option[Iterable[Uri]], Item => Option[Iterable[Entity]], Item => Option[Iterable[Uri]])] = {
+    this.logDebug("assembleStatements(triplesmaps)")
     val subjectGraphGenerator = graphAssembler.assemble(triplesMap.subjectMap.graphMap)
 
 
@@ -56,7 +59,8 @@ class StatementsAssembler(subjectAssembler: SubjectGeneratorAssembler = SubjectG
     })
     // create the statements
     predicateObjects.map(predicateObject => {
-      (subjectGenerator, predicateObject._1, predicateObject._2, subjectGraphGenerator)
+      val graphGenerator = if(triplesMap.subjectMap.graphMap.isDefined) subjectGraphGenerator else predicateObject._3
+      (subjectGenerator, predicateObject._1, predicateObject._2, graphGenerator)
     }) ++ classMappings // add class mappings
 
   }
@@ -93,7 +97,7 @@ object StatementsAssembler {
 
   def assembleParentStatements(joinedTriplesMap: JoinedTriplesMap): List[Statement[JoinedItem]] = {
     val triples = new StatementsAssembler()
-      .assembleStatements(joinedTriplesMap.parentTriplesMap)
+      .assembleStatements(TriplesMapsCache.get(joinedTriplesMap.parentTriplesMap).get)
     triples.map(triple => ParentStatement(triple._1, triple._2, triple._3, triple._4))
   }
 
diff --git a/src/main/scala/io/rml/framework/engine/statement/SubjectGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/SubjectGeneratorAssembler.scala
index 588254ad..25053311 100644
--- a/src/main/scala/io/rml/framework/engine/statement/SubjectGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/SubjectGeneratorAssembler.scala
@@ -25,7 +25,8 @@
 
 package io.rml.framework.engine.statement
 
-import io.rml.framework.core.model.{TermMap, TermNode}
+import io.rml.framework.core.function.FunctionUtils
+import io.rml.framework.core.model.{TermMap, TermNode, Uri}
 import io.rml.framework.core.vocabulary.RMLVoc
 import io.rml.framework.flink.item.Item
 import io.rml.framework.shared.TermTypeException
@@ -34,19 +35,35 @@ import io.rml.framework.shared.TermTypeException
 class SubjectGeneratorAssembler extends TermMapGeneratorAssembler {
   override def assemble(termMap: TermMap): (Item) => Option[Iterable[TermNode]] = {
 
-    /**
-      * Tried implementing literal check in subject map extractor but it was assumed
-      * that the extractor would just extract subject maps even if it is typed to be literal.
-      *
-      * Maybe move this check to subject map extractor for early checking during the reading process? 
-      */
-    termMap.termType.get.toString match {
-      case RMLVoc.Class.LITERAL => throw new TermTypeException("Subject cannot be of type Literal!")
-      case _ =>
+    if(termMap.hasFunctionMap){
+      val fmap = termMap.functionMap.head
+      val assembledFunction = FunctionMapGeneratorAssembler().assemble(fmap)
+      assembledFunction.andThen(item => {
 
-    }
-    super.assemble(termMap).asInstanceOf[(Item) => Option[Iterable[TermNode]]]
+        if(item.isDefined) {
+          item.map(iter => iter.flatMap(elem => {
+            val castedResult = FunctionUtils.typeCastDataType(elem, termMap.datatype)
+            castedResult.map(v => Uri(v.toString))
+          }))
+        }else {
+          None
+        }
+      })
+
+    }else {
+      /**
+       * Tried implementing literal check in subject map extractor but it was assumed
+       * that the extractor would just extract subject maps even if it is typed to be literal.
+       *
+       * Maybe move this check to subject map extractor for early checking during the reading process?
+       */
+      termMap.termType.get.toString match {
+        case RMLVoc.Class.LITERAL => throw new TermTypeException("Subject cannot be of type Literal!")
+        case _ =>
 
+      }
+      super.assemble(termMap).asInstanceOf[(Item) => Option[Iterable[TermNode]]]
+    }
   }
 
 }
diff --git a/src/main/scala/io/rml/framework/flink/item/xml/XMLItem.scala b/src/main/scala/io/rml/framework/flink/item/xml/XMLItem.scala
index db9c5dda..801b4dfa 100644
--- a/src/main/scala/io/rml/framework/flink/item/xml/XMLItem.scala
+++ b/src/main/scala/io/rml/framework/flink/item/xml/XMLItem.scala
@@ -25,20 +25,20 @@
 
 package io.rml.framework.flink.item.xml
 
-import java.io.{ByteArrayInputStream, InputStreamReader}
-import java.nio.charset.StandardCharsets
-
 import com.ximpleware.extended.{AutoPilotHuge, VTDGenHuge, XMLBuffer}
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.flink.item.Item
+import io.rml.framework.flink.item.xml.XMLItem.documentToString
 import io.rml.framework.flink.source.{XMLIterator, XMLStream}
 import io.rml.framework.flink.util.XMLNamespace
-import javax.xml.namespace.NamespaceContext
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.xpath.{XPathConstants, XPathFactory}
 import org.apache.commons.io.IOUtils
 import org.w3c.dom.{Document, NodeList}
 
+import java.io.{ByteArrayInputStream, InputStreamReader}
+import java.nio.charset.StandardCharsets
+import javax.xml.namespace.NamespaceContext
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.xpath.{XPathConstants, XPathFactory}
 import scala.util.control.NonFatal
 //import scala.xml.{PrettyPrinter, XML}
 
@@ -79,20 +79,7 @@ class XMLItem(xml: Document, namespaces: Map[String, String], val tag: String) e
     } else None
   }
 
-  override def toString: String = {
-    import java.io.StringWriter
-
-    import javax.xml.transform.dom.DOMSource
-    import javax.xml.transform.stream.StreamResult
-    import javax.xml.transform.{OutputKeys, TransformerFactory}
-    val tf = TransformerFactory.newInstance
-    val transformer = tf.newTransformer
-    transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
-    val writer = new StringWriter
-    transformer.transform(new DOMSource(xml), new StreamResult(writer))
-    val output = writer.getBuffer.toString.replaceAll("\n|\r", "")
-    output
-  }
+  override def toString: String = documentToString(xml)
 
 }
 
@@ -113,10 +100,21 @@ object XMLItem extends Logging {
   // Since this is being used in other working parts of the code, it won't be refactored for now 20/7/18
   def fromString(xml: String, namespaces: Map[String, String] = Map(), xpath:String): XMLItem = {
     val documentBuilderFactory = DocumentBuilderFactory.newInstance()
-    documentBuilderFactory.setNamespaceAware(true)
-    val documentBuilder = documentBuilderFactory.newDocumentBuilder()
+    documentBuilderFactory.setNamespaceAware(false)
+    var documentBuilder = documentBuilderFactory.newDocumentBuilder()
+    var document: Document = documentBuilder.parse(IOUtils.toInputStream(xml, StandardCharsets.UTF_8))
+
+    // add namespaces to root element
+    val documentRoot = document.getDocumentElement
+    for ((namespacePrefix, namespaceURI) <- namespaces) {
+      documentRoot.setAttributeNS("http://www.w3.org/2000/xmlns/", s"xmlns:$namespacePrefix", namespaceURI)
+    }
 
-    val document: Document = documentBuilder.parse(IOUtils.toInputStream(xml, StandardCharsets.UTF_8))
+    // parse document again, now namespace aware
+    // this is a workaround since there does not seem to be a straightforward way to pass namespaces to the parser
+    documentBuilderFactory.setNamespaceAware(true)
+    documentBuilder = documentBuilderFactory.newDocumentBuilder()
+    document = documentBuilder.parse(IOUtils.toInputStream(documentToString(document), StandardCharsets.UTF_8))
 
     val tag = xpath match {
       case XMLStream.DEFAULT_PATH_OPTION => ""
@@ -156,7 +154,7 @@ object XMLItem extends Logging {
           Some(result)
 
         } catch {
-          case NonFatal(e) => logError(s"Error while parsing XML:\n${xml}", e); None
+          case NonFatal(e) => logError(s"Error while parsing XML:\n$xml", e); None
         }
       }
         .flatten
@@ -169,4 +167,17 @@ object XMLItem extends Logging {
     }
   }
 
+  def documentToString(document: Document) : String = {
+    import java.io.StringWriter
+    import javax.xml.transform.dom.DOMSource
+    import javax.xml.transform.stream.StreamResult
+    import javax.xml.transform.{OutputKeys, TransformerFactory}
+    val tf = TransformerFactory.newInstance
+    val transformer = tf.newTransformer
+    transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
+    val writer = new StringWriter
+    transformer.transform(new DOMSource(document), new StreamResult(writer))
+    val output = writer.getBuffer.toString.replaceAll("[\n\r]", "")
+    output
+  }
 }
diff --git a/src/main/scala/io/rml/framework/flink/sink/FlinkResource.scala b/src/main/scala/io/rml/framework/flink/sink/FlinkResource.scala
deleted file mode 100644
index cfc4fe09..00000000
--- a/src/main/scala/io/rml/framework/flink/sink/FlinkResource.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  * MIT License
-  *
-  * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
-  *
-  * Permission is hereby granted, free of charge, to any person obtaining a copy
-  * of this software and associated documentation files (the "Software"), to deal
-  * in the Software without restriction, including without limitation the rights
-  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  * copies of the Software, and to permit persons to whom the Software is
-  * furnished to do so, subject to the following conditions:
-  *
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  *
-  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  * THE SOFTWARE.
-  *
-  **/
-package io.rml.framework.flink.sink
-
-import io.rml.framework.core.model.rdf.{RDFLiteral, RDFResource}
-
-class FlinkResource extends RDFResource {
-  /**
-    *
-    * @param property
-    * @return
-    */
-  override def listProperties(property: String) = ???
-
-  /**
-    *
-    * @param property
-    * @param resource
-    */
-  override def addProperty(property: String, resource: String) = ???
-
-  /**
-    *
-    * @param property
-    * @param resource
-    */
-  override def addProperty(property: String, resource: RDFResource) = ???
-
-  /**
-    *
-    * @param property
-    * @param literal
-    */
-  override def addLiteral(property: String, literal: String) = ???
-
-  /**
-    *
-    * @param property
-    * @param literal
-    */
-  override def addLiteral(property: String, literal: RDFLiteral) = ???
-
-  override def uri = ???
-
-  override def getType = ???
-}
diff --git a/src/main/scala/io/rml/framework/flink/source/CSVStream.scala b/src/main/scala/io/rml/framework/flink/source/CSVStream.scala
index 0b252b63..a54a1b2a 100644
--- a/src/main/scala/io/rml/framework/flink/source/CSVStream.scala
+++ b/src/main/scala/io/rml/framework/flink/source/CSVStream.scala
@@ -25,8 +25,6 @@
 
 package io.rml.framework.flink.source
 
-import java.nio.file.Paths
-
 import io.rml.framework.core.model.{FileStream, KafkaStream, StreamDataSource, TCPSocketStream}
 import io.rml.framework.flink.item.Item
 import io.rml.framework.flink.item.csv.{CSVHeader, CSVItem}
@@ -37,10 +35,12 @@ import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.scala._
 import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
 import org.apache.flink.table.api.Table
-import org.apache.flink.table.api.scala.StreamTableEnvironment
+import org.apache.flink.table.api.bridge.scala.StreamTableEnvironment
 import org.apache.flink.table.descriptors.FileSystem
 import org.apache.flink.types.Row
 
+import java.nio.file.Paths
+
 case class CSVStream(stream: DataStream[Iterable[Item]] ) extends Stream
 
 object CSVStream {
diff --git a/src/main/scala/io/rml/framework/flink/source/StreamUtil.scala b/src/main/scala/io/rml/framework/flink/source/StreamUtil.scala
index 78c56012..844c8c14 100644
--- a/src/main/scala/io/rml/framework/flink/source/StreamUtil.scala
+++ b/src/main/scala/io/rml/framework/flink/source/StreamUtil.scala
@@ -29,24 +29,11 @@ import io.rml.framework.core.model.TCPSocketStream
 import io.rml.framework.core.util.StreamerConfig
 import org.apache.flink.api.scala._
 import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
-import org.apache.flink.streaming.connectors.netty.example.TcpReceiverSource
 
 object StreamUtil {
 
   def createTcpSocketSource(tCPSocketStream: TCPSocketStream, delimiter:String="\n")(implicit env: StreamExecutionEnvironment): DataStream[String] = {
-
-    tCPSocketStream._type match {
-        //TODO Update flink to 1.3.3 to use latest methods in scala without java -> scala conversion.
-
-      /**
-        * Flink 1.3.2's scala socketTextStream can't use custom multi-char/String delimiter  (there is delimiter param but it's not being used)
-        *
-        */
-
-
-      case TCPSocketStream.TYPE.PULL =>     new DataStream[String](env.getJavaEnv.socketTextStream(tCPSocketStream.hostName, tCPSocketStream.port, delimiter))
-      case TCPSocketStream.TYPE.PUSH => env.addSource(new TcpReceiverSource(tCPSocketStream.port)).setParallelism(1) // to avoid library to setup multiple instances
-    }
+    new DataStream[String](env.getJavaEnv.socketTextStream(tCPSocketStream.hostName, tCPSocketStream.port, delimiter))
   }
 
   /**
diff --git a/src/main/scala/io/rml/framework/flink/source/XMLIterator.scala b/src/main/scala/io/rml/framework/flink/source/XMLIterator.scala
index 62491c6c..7746b73a 100644
--- a/src/main/scala/io/rml/framework/flink/source/XMLIterator.scala
+++ b/src/main/scala/io/rml/framework/flink/source/XMLIterator.scala
@@ -24,15 +24,13 @@
   **/
 package io.rml.framework.flink.source
 
-import com.ximpleware.VTDNav
 import com.ximpleware.extended.{AutoPilotHuge, VTDNavHuge}
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.flink.item.Item
 import io.rml.framework.flink.item.xml.XMLItem
-import javax.xml.parsers.DocumentBuilderFactory
 import org.slf4j.LoggerFactory
 
-import scala.collection.mutable
+import java.nio.charset.{Charset, StandardCharsets}
 
 /**
   * Custom iterator that is a wrapper around the VTD-XML library for parsing XML
@@ -44,11 +42,8 @@ import scala.collection.mutable
   */
 class XMLIterator(val ap: AutoPilotHuge, vn: VTDNavHuge, namespaces: Map[String, String], xPath: String) extends Iterator[Option[Item]] with Logging {
 
-  private val documentBuilderFactory = DocumentBuilderFactory.newInstance()
-  documentBuilderFactory.setNamespaceAware(true)
-  private val documentBuilder = documentBuilderFactory.newDocumentBuilder()
-
   private val LOG = LoggerFactory.getLogger(XMLIterator.getClass)
+  private val xmlBuffer = vn.getXML
 
   // flag for indicating if the iterator has to stop or not
   var finished = false
@@ -76,130 +71,60 @@ class XMLIterator(val ap: AutoPilotHuge, vn: VTDNavHuge, namespaces: Map[String,
     // evaluate until the first match
     val node = ap.evalXPath()
 
+    val fragment = vn.getElementFragment
+    val fragmentOffset = fragment(0);
+    val fragmentLength = fragment(1).toInt
+
     if (isDebugEnabled) logDebug("Node = " + node)
 
     // if node != -1: there is a match
     if (node != -1) {
-
       if (isDebugEnabled) logDebug("RAW STRING?: " + vn.toString(node))
 
-      // get the element string
-      val element = vn.toString(node)
-      val ap2 = new AutoPilotHuge(vn)
-      ap2.selectXPath("@*")
-
-      val attributesMap = new mutable.HashMap[String, String]()
-      var i = ap2.evalXPath()
-
-      while (i != -1) {
-
-        val attributeKey = vn.toString(i)
-        val attributeValue = vn.toString(i + 1)
-        attributesMap.put(attributeKey, attributeValue)
-        i = ap2.evalXPath()
+      val fragmentBytes = new Array[Byte](fragmentLength)
 
+      // XMLMemMappedBuffer does not yet support the more efficient getBytes() method
+      // the byteAt() method is supported, so bytes have to be copied inefficiently using the byteAt() method
+      var fragmentByteIndex = 0
+      while (fragmentByteIndex < fragmentLength) {
+        fragmentBytes(fragmentByteIndex) = xmlBuffer.byteAt(fragmentOffset + fragmentByteIndex)
+        fragmentByteIndex += 1
       }
 
-      val document = documentBuilder.newDocument()
-
-      // check for namespaces
-      val firstElement = if (element.contains(':')) {
-        val regex = "(.*):".r
-        val matches = regex.findAllIn(element).matchData map {
-          m => m.group(1)
-        }
-        val namespaceKey = matches.toList.head
-        val namespace = namespaces.get(namespaceKey).orNull
-        document.createElementNS(namespace, element)
-      } else document.createElement(element)
-
-      attributesMap.foreach(entry => {
-        firstElement.setAttribute(entry._1, entry._2)
-      })
-
-      document.appendChild(firstElement)
-
-      // map to hold attributes and values of element
-      val map = new mutable.HashMap[String, String]()
-
-      // navigate to the first child
-      if (vn.toElement(VTDNav.FIRST_CHILD)) {
-        // if first child has a direct value, add to map
-        // if not, skip this one
-        val node = vn.toString(vn.getCurrentIndex)
-        if (vn.getText != -1) {
-          val attribute = vn.toString(vn.getText - 1)
-          val value = vn.toString(vn.getText)
-          map.put(attribute, value)
-          //document.createElement(attribute)
-          val element = if (node.contains(':')) {
-            val regex = "(.*):".r
-            val matches = regex.findAllIn(node).matchData map {
-              m => m.group(1)
-            }
-            val namespaceKey = matches.toList.head
-            val namespace = namespaces.get(namespaceKey).orNull
-            document.createElementNS(namespace, node)
-          } else document.createElement(node)
-
-          element.appendChild(document.createTextNode(value))
-          firstElement.appendChild(element)
-        }
-
-        // navigate to the siblings of the first child, if there are:
-        // add the attribute and value to the map
-        while (vn.toElement(VTDNav.NEXT_SIBLING)) {
-          val node = vn.toString(vn.getCurrentIndex)
-          if (vn.getText != -1) {
-            // if current sibling has a direct value, add to map
-            // if not, skip this one
-            val value = vn.toString(vn.getText)
-            val attribute = vn.toString(vn.getText - 1)
-            val element = if (node.contains(':')) {
-              val regex = "(.*):".r
-              val matches = regex.findAllIn(node).matchData map {
-                m => m.group(1)
-              }
-              val namespaceKey = matches.toList.head
-              val namespace = namespaces.get(namespaceKey).orNull
-              document.createElementNS(namespace, node)
-            }
-            else document.createElement(node)
-            element.appendChild(document.createTextNode(value))
-            firstElement.appendChild(element)
-          }
-
-        }
-
-        // navigate back to the parent
-        vn.toElement(VTDNav.PARENT)
-
-      }
-
-
-      // return the item
-      //Some(item)
-      import java.io.StringWriter
-
-      import javax.xml.transform.dom.DOMSource
-      import javax.xml.transform.stream.StreamResult
-      import javax.xml.transform.{OutputKeys, TransformerFactory}
-      val xmlString = try {
-        val sw = new StringWriter
-        val tf = TransformerFactory.newInstance
-        val transformer = tf.newTransformer
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no")
-        transformer.setOutputProperty(OutputKeys.METHOD, "xml")
-        transformer.setOutputProperty(OutputKeys.INDENT, "yes")
-        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8")
-        transformer.transform(new DOMSource(document), new StreamResult(sw))
-        sw.toString
-      } catch {
-        case ex: Exception =>
-          throw new RuntimeException("Error converting to String", ex)
+      val encoding = vn.getEncoding match {
+        case VTDNavHuge.FORMAT_ASCII => StandardCharsets.US_ASCII
+        case VTDNavHuge.FORMAT_ISO_8859_1 => StandardCharsets.ISO_8859_1
+        case VTDNavHuge.FORMAT_UTF8 => StandardCharsets.UTF_8
+        case VTDNavHuge.FORMAT_UTF_16BE => StandardCharsets.UTF_16BE
+        case VTDNavHuge.FORMAT_UTF_16LE => StandardCharsets.UTF_16LE
+        case VTDNavHuge.FORMAT_ISO_8859_2 => Charset.forName("ISO-8859-2")
+        case VTDNavHuge.FORMAT_ISO_8859_3 => Charset.forName("ISO-8859-3")
+        case VTDNavHuge.FORMAT_ISO_8859_4 => Charset.forName("ISO-8859-4")
+        case VTDNavHuge.FORMAT_ISO_8859_5 => Charset.forName("ISO-8859-5")
+        case VTDNavHuge.FORMAT_ISO_8859_6 => Charset.forName("ISO-8859-6")
+        case VTDNavHuge.FORMAT_ISO_8859_7 => Charset.forName("ISO-8859-7")
+        case VTDNavHuge.FORMAT_ISO_8859_8 => Charset.forName("ISO-8859-8")
+        case VTDNavHuge.FORMAT_ISO_8859_9 => Charset.forName("ISO-8859-9")
+        case VTDNavHuge.FORMAT_ISO_8859_10 => Charset.forName("ISO-8859-10")
+        case VTDNavHuge.FORMAT_ISO_8859_11 => Charset.forName("ISO-8859-11")
+        case VTDNavHuge.FORMAT_ISO_8859_12 => Charset.forName("ISO-8859-12")
+        case VTDNavHuge.FORMAT_ISO_8859_13 => Charset.forName("ISO-8859-13")
+        case VTDNavHuge.FORMAT_ISO_8859_14 => Charset.forName("ISO-8859-14")
+        case VTDNavHuge.FORMAT_ISO_8859_15 => Charset.forName("ISO-8859-15")
+        case VTDNavHuge.FORMAT_ISO_8859_16 => Charset.forName("ISO-8859-16")
+        case VTDNavHuge.FORMAT_WIN_1250 => Charset.forName("windows-1250")
+        case VTDNavHuge.FORMAT_WIN_1251 => Charset.forName("windows-1251")
+        case VTDNavHuge.FORMAT_WIN_1252 => Charset.forName("windows-1252")
+        case VTDNavHuge.FORMAT_WIN_1253 => Charset.forName("windows-1253")
+        case VTDNavHuge.FORMAT_WIN_1254 => Charset.forName("windows-1254")
+        case VTDNavHuge.FORMAT_WIN_1255 => Charset.forName("windows-1255")
+        case VTDNavHuge.FORMAT_WIN_1256 => Charset.forName("windows-1256")
+        case VTDNavHuge.FORMAT_WIN_1257 => Charset.forName("windows-1257")
+        case VTDNavHuge.FORMAT_WIN_1258 => Charset.forName("windows-1258")
+        case _ => StandardCharsets.UTF_8
       }
 
-      val result = Some(XMLItem.fromString(xmlString, namespaces, xPath))
+      val result = Some(XMLItem.fromString(new String(fragmentBytes, encoding), namespaces, xPath))
       result
     } else {
       if (isDebugEnabled) logDebug("No match found => done.")
diff --git a/src/main/scala/io/rml/framework/flink/util/ParameterUtil.scala b/src/main/scala/io/rml/framework/flink/util/ParameterUtil.scala
index 63889156..9c635a41 100644
--- a/src/main/scala/io/rml/framework/flink/util/ParameterUtil.scala
+++ b/src/main/scala/io/rml/framework/flink/util/ParameterUtil.scala
@@ -78,7 +78,7 @@ object ParameterUtil {
   val parser = new scopt.OptionParser[ParameterConfig]("RMLStreamer") {
     override def showUsageOnError = true
 
-    head("RMLStreamer", "2.0.0")
+    head("RMLStreamer", "2.1.0")
 
     opt[String]('j', "job-name").valueName("<job name>")
       .optional()
@@ -110,21 +110,27 @@ object ParameterUtil {
     opt[Unit]("bulk")
       .optional()
       .action((_, config) => config.copy(postProcessor = PostProcessorOption.Bulk))
-      .text("Write all triples generated from one input record at once.")
+      .text("Write all triples generated from one input record at once, instead of writing triples the moment they are generated.")
 
     opt[Long]("checkpoint-interval").valueName("<time (ms)>")
         .optional()
         .action((value, config) => config.copy(checkpointInterval = Some(value)))
-        .text("If given, Flink's checkpointing is enabled with the given interval. If not given, checkpointing is disabled.")
+        .text("If given, Flink's checkpointing is enabled with the given interval. " +
+          "If not given, checkpointing is enabled when writing to a file (this is required to use the flink StreamingFileSink). " +
+          "Otherwise, checkpointing is disabled.")
 
     // options specifically for writing output to file
     cmd("toFile")
-      .text("Write output to file")
+      .text("Write output to file \n" +
+        "Note: when the mapping consists only of stream triple maps, a StreamingFileSink is used. " +
+        "This sink will write the output to a part file at every checkpoint.")
       .action((_, config) => config.copy(outputSink = OutputSinkOption.File))
       .children(
         opt[String]('o', "output-path").valueName("<output file>").required()
           .action((value, config) => config.copy(outputPath = Some(value)))
-          .text("The path to an output file.")
+          .text("The path to an output file. " +
+            "Note: when a StreamingFileSink is used (the mapping consists only of stream triple maps), this path specifies a directory and optionally an extension. " +
+            "Part files will be written to the given directory and the given extension will be used for each part file.")
       )
 
     // options specifically for writing output to a Kafka topic
diff --git a/src/main/scala/io/rml/framework/shared/FnOException.scala b/src/main/scala/io/rml/framework/shared/FnOException.scala
new file mode 100644
index 00000000..9230bc98
--- /dev/null
+++ b/src/main/scala/io/rml/framework/shared/FnOException.scala
@@ -0,0 +1,3 @@
+package io.rml.framework.shared;
+
+class FnOException(msg: String) extends Exception(msg)
diff --git a/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/head.csv b/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/head.csv
new file mode 100644
index 00000000..8ba04cce
--- /dev/null
+++ b/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/head.csv
@@ -0,0 +1,3 @@
+fragment_id_mam,mediaobject_id_mam,cp,cp_id,sp_id,sp_name,pid,dc_description,dc_format,dc_publisher,dc_source,dc_terms,dc_title,dcterms_abstract,dcterms_created,dcterms_issued
+f_id_mam_1,m_id_mam_1,cp1,cp_id1,sp_id1,sp_name1,pid1,dc_description1,dc_format1,dc_publisher1,dc_source1,dc_terms1,dc_title1,dcterms_abstract1,dcterms_created1,dcterms_issued1
+f_id_mam_2,m_id_mam_2,cp2,cp_id2,sp_id2,sp_name2,pid2,dc_description2,dc_format2,dc_publisher2,dc_source2,dc_terms2,dc_title2,dcterms_abstract2,dcterms_created2,dcterms_issued2
diff --git a/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/mapping.ttl b/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/mapping.ttl
new file mode 100644
index 00000000..6799b86d
--- /dev/null
+++ b/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/mapping.ttl
@@ -0,0 +1,119 @@
+@prefix map: <http://example.org/map#>.
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+ @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix vcard: <http://www.w3.org/2001/vcard-rdf/3.0#> . 
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 
+@prefix skos: <http://www.w3.org/2004/02/skos/core#> . 
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+@prefix conf: <http://ufc.br/rdb2rdfmb/conf/> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+@prefix edtf: <http://id.loc.gov/datatypes/edtf> .
+@prefix meemoo: <http://data.meemoo.be/ns/> .
+
+map:FragmentMetadata rml:source "head.csv";
+    rml:referenceFormulation ql:CSV.
+
+map:Fragment a rr:TriplesMap;
+    rml:logicalSource  map:FragmentMetadata;
+    rr:subjectMap [
+        rr:template "http://data.meemoo.be/fm/{fragment_id_mam}";
+        rr:class meemoo:Fragment;
+    ];
+    rr:predicateObjectMap [
+        rr:predicate meemoo:hasContentpartner;
+        rr:objectMap [ rr:parentTriplesMap map:Contentpartner ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate meemoo:hasServiceprovider;
+        rr:objectMap [ rr:parentTriplesMap map:Serviceprovider ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:isPartOf;
+        rr:objectMap [ rr:parentTriplesMap map:MediaObject ];
+    ].
+
+map:MediaObject a rr:TriplesMap;
+    rml:logicalSource map:FragmentMetadata;
+    rr:subjectMap [
+        rr:template "http://data.meemoo.be/mo/{mediaobject_id_mam}";
+        rr:class meemoo:MediaObject;
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:hasPart;
+        rr:objectMap [ rr:parentTriplesMap map:Fragment ];
+    ].
+
+map:Contentpartner a rr:TriplesMap;
+    rml:logicalSource map:FragmentMetadata;
+    rr:subjectMap [
+        rr:template "http://data.meemoo.be/cp/{cp_id}";
+        rr:class meemoo:Contentpartner;
+    ];
+    rr:predicateObjectMap [
+        rr:predicate rdfs:label;
+        rr:objectMap [ rml:reference "cp" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dc:identifier;
+        rr:objectMap [ rml:reference "cp_id" ];
+    ].
+
+
+map:Serviceprovider a rr:TriplesMap;
+    rml:logicalSource map:FragmentMetadata;
+    rr:subjectMap [
+        rr:template "http://data.meemoo.be/sp/{sp_id}";
+        rr:class meemoo:Serviceprovider;
+    ];
+    rr:predicateObjectMap [
+        rr:predicate rdfs:label;
+        rr:objectMap [ rml:reference "sp_name" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dc:identifier;
+        rr:objectMap [ rml:reference "sp_id" ];
+    ].
+
+map:IntellectualEntity a rr:TriplesMap;
+    rml:logicalSource map:FragmentMetadata;
+    rr:subjectMap [
+        rr:template "http://data.meemoo.be/ie/{pid}";
+        rr:class meemoo:IntellectualEntity;
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:title;
+        rr:objectMap [ rml:reference "dc_title" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:abstract;
+        rr:objectMap [ rml:reference "dcterms_abstract" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:created;
+        rr:objectMap [ rml:reference "dcterms_created" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:issued;
+        rr:objectMap [ rml:reference "dcterms_issued" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:description;
+        rr:objectMap [ rml:reference "dc_description" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:publisher;
+        rr:objectMap [ rml:reference "dc_publisher" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:source;
+        rr:objectMap [ rml:reference "dc_source" ];
+    ];
+    rr:predicateObjectMap [
+        rr:predicate dcterms:date;
+        rr:objectMap [ rml:reference "dc_terms"; rr:datatype edtf:EDTF ];
+    ].
diff --git a/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/output.ttl b/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/output.ttl
new file mode 100644
index 00000000..5dfa51cf
--- /dev/null
+++ b/src/test/resources/bugs/108_stackoverflow_when_reading_mapping_github_19/output.ttl
@@ -0,0 +1,58 @@
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix meemoo: <http://data.meemoo.be/ns/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+<http://data.meemoo.be/cp/cp_id1> a meemoo:Contentpartner;
+  dc:identifier "cp_id1";
+  rdfs:label "cp1" .
+
+<http://data.meemoo.be/cp/cp_id2> a meemoo:Contentpartner;
+  dc:identifier "cp_id2";
+  rdfs:label "cp2" .
+
+<http://data.meemoo.be/fm/f_id_mam_1> a meemoo:Fragment;
+  meemoo:hasContentpartner <http://data.meemoo.be/cp/cp_id1>, <http://data.meemoo.be/cp/cp_id2>;
+  meemoo:hasServiceprovider <http://data.meemoo.be/sp/sp_id1>, <http://data.meemoo.be/sp/sp_id2>;
+  dcterms:isPartOf <http://data.meemoo.be/mo/m_id_mam_1>, <http://data.meemoo.be/mo/m_id_mam_2> .
+
+<http://data.meemoo.be/fm/f_id_mam_2> a meemoo:Fragment;
+  meemoo:hasContentpartner <http://data.meemoo.be/cp/cp_id1>, <http://data.meemoo.be/cp/cp_id2>;
+  meemoo:hasServiceprovider <http://data.meemoo.be/sp/sp_id1>, <http://data.meemoo.be/sp/sp_id2>;
+  dcterms:isPartOf <http://data.meemoo.be/mo/m_id_mam_1>, <http://data.meemoo.be/mo/m_id_mam_2> .
+
+<http://data.meemoo.be/ie/pid1> a meemoo:IntellectualEntity;
+  dcterms:abstract "dcterms_abstract1";
+  dcterms:created "dcterms_created1";
+  dcterms:date "dc_terms1"^^<http://id.loc.gov/datatypes/edtfEDTF>;
+  dcterms:description "dc_description1";
+  dcterms:issued "dcterms_issued1";
+  dcterms:publisher "dc_publisher1";
+  dcterms:source "dc_source1";
+  dcterms:title "dc_title1" .
+
+<http://data.meemoo.be/ie/pid2> a meemoo:IntellectualEntity;
+  dcterms:abstract "dcterms_abstract2";
+  dcterms:created "dcterms_created2";
+  dcterms:date "dc_terms2"^^<http://id.loc.gov/datatypes/edtfEDTF>;
+  dcterms:description "dc_description2";
+  dcterms:issued "dcterms_issued2";
+  dcterms:publisher "dc_publisher2";
+  dcterms:source "dc_source2";
+  dcterms:title "dc_title2" .
+
+<http://data.meemoo.be/mo/m_id_mam_1> a meemoo:MediaObject;
+  dcterms:hasPart <http://data.meemoo.be/fm/f_id_mam_1>, <http://data.meemoo.be/fm/f_id_mam_2> .
+
+<http://data.meemoo.be/mo/m_id_mam_2> a meemoo:MediaObject;
+  dcterms:hasPart <http://data.meemoo.be/fm/f_id_mam_1>, <http://data.meemoo.be/fm/f_id_mam_2> .
+
+<http://data.meemoo.be/sp/sp_id1> a meemoo:Serviceprovider;
+  dc:identifier "sp_id1";
+  rdfs:label "sp_name1" .
+
+<http://data.meemoo.be/sp/sp_id2> a meemoo:Serviceprovider;
+  dc:identifier "sp_id2";
+  rdfs:label "sp_name2" .
diff --git a/src/test/resources/bugs/124_complex_xpath_reference/input.xml b/src/test/resources/bugs/124_complex_xpath_reference/input.xml
new file mode 100644
index 00000000..bff5be06
--- /dev/null
+++ b/src/test/resources/bugs/124_complex_xpath_reference/input.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<products>
+  <product>
+    <id>1</id>
+    <Property Name="1">
+      <String>1</String>
+    </Property>
+  </product>
+</products>
diff --git a/src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl.bak b/src/test/resources/bugs/124_complex_xpath_reference/mapping.rml.ttl
similarity index 63%
rename from src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl.bak
rename to src/test/resources/bugs/124_complex_xpath_reference/mapping.rml.ttl
index e79f0c20..911ff188 100644
--- a/src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl.bak
+++ b/src/test/resources/bugs/124_complex_xpath_reference/mapping.rml.ttl
@@ -4,26 +4,23 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+
 @base <http://example.com/base/> .
 
 <TriplesMap1>
   a rr:TriplesMap;
-    
+
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0001b-XML/student.xml";
+    rml:source "input.xml";
     rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
+    rml:iterator "//product"
   ];
 
-  rr:subjectMap [
-    rr:template "{Name}";
-    rr:termType rr:BlankNode
-  ]; 
-	
+  rr:subjectMap [ rr:template "http://example.org/products/{id}" ];
+
   rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [
-      rml:reference "Name"
+    rr:predicate ex:id ; 
+    rr:objectMap    [ 
+      rml:reference "Property[@Name='1']/String";
     ]
   ].
-
diff --git a/src/test/resources/bugs/124_complex_xpath_reference/output.ttl b/src/test/resources/bugs/124_complex_xpath_reference/output.ttl
new file mode 100644
index 00000000..7297bf8c
--- /dev/null
+++ b/src/test/resources/bugs/124_complex_xpath_reference/output.ttl
@@ -0,0 +1 @@
+<http://example.org/products/1> <http://example.com/id> "1".
\ No newline at end of file
diff --git a/src/test/resources/bugs/36/mapping.ttl b/src/test/resources/bugs/36/mapping.ttl
index 83dc8d61..0d0b30df 100644
--- a/src/test/resources/bugs/36/mapping.ttl
+++ b/src/test/resources/bugs/36/mapping.ttl
@@ -7,7 +7,7 @@
 
 <TriplesMap> a rr:TriplesMap;
   rml:logicalSource [
-    rml:source "bugs/36/input.json";
+    rml:source "input.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.people[*]"
   ];
diff --git a/src/test/resources/bugs/58_no_triples_when_no_id/mapping.ttl b/src/test/resources/bugs/58_no_triples_when_no_id/mapping.ttl
index ee94b033..d7a6dd3d 100644
--- a/src/test/resources/bugs/58_no_triples_when_no_id/mapping.ttl
+++ b/src/test/resources/bugs/58_no_triples_when_no_id/mapping.ttl
@@ -18,7 +18,7 @@
 
   :map_anomaly_0 rml:logicalSource :source_0.
   :source_0 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$";
       rml:referenceFormulation ql:JSONPath.
   :map_anomaly_0 a rr:TriplesMap;
@@ -110,7 +110,7 @@
       rr:termType rr:IRI.
   :map_stimulus_0 rml:logicalSource :source_1.
   :source_1 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$.anomaly.parts[*]";
       rml:referenceFormulation ql:JSONPath.
   :map_stimulus_0 a rr:TriplesMap;
@@ -156,7 +156,7 @@
       rr:termType rr:IRI.
   :map_observation_from_0 rml:logicalSource :source_2.
   :source_2 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$.anomaly.parts[*]";
       rml:referenceFormulation ql:JSONPath.
   :map_observation_from_0 a rr:TriplesMap;
@@ -176,7 +176,7 @@
       rr:datatype <http://www.w3.org/2001/XMLSchema#dateTime>.
   :map_observation_to_0 rml:logicalSource :source_3.
   :source_3 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$.anomaly.parts[*]";
       rml:referenceFormulation ql:JSONPath.
   :map_observation_to_0 a rr:TriplesMap;
@@ -196,7 +196,7 @@
       rr:datatype <http://www.w3.org/2001/XMLSchema#dateTime>.
   :map_procedure_0 rml:logicalSource :source_4.
   :source_4 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$";
       rml:referenceFormulation ql:JSONPath.
   :map_procedure_0 a rr:TriplesMap;
@@ -224,7 +224,7 @@
       rr:termType rr:IRI.
   :map_procedure_bn_0 rml:logicalSource :source_5.
   :source_5 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$";
       rml:referenceFormulation ql:JSONPath.
   :map_procedure_bn_0 a rr:TriplesMap;
@@ -243,7 +243,7 @@
       rr:termType rr:Literal.
   :map_sensor_property_0 rml:logicalSource :source_6.
   :source_6 a rml:LogicalSource;
-      rml:source "bugs/58_no_triples_when_no_id/input.json";
+      rml:source "input.json";
       rml:iterator "$.anomaly.parts[*]";
       rml:referenceFormulation ql:JSONPath.
   :map_sensor_property_0 a rr:TriplesMap;
diff --git a/src/test/resources/example1/example.rml.ttl b/src/test/resources/example1/example.rml.ttl
index 2d6e7623..446bdcfa 100755
--- a/src/test/resources/example1/example.rml.ttl
+++ b/src/test/resources/example1/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps> a rr:TriplesMap;
 rml:logicalSource [ 
-	rml:source "example1/example1.xml";
+	rml:source "example1.xml";
         rml:referenceFormulation ql:XPath;
 	rml:iterator "/notes/note";
 ];
@@ -47,7 +47,7 @@ rr:subjectMap [
         
 <#DateTime>
     rml:logicalSource [ 
-	rml:source "example1/example1.xml";
+	rml:source "example1.xml";
 	rml:iterator "/notes/note";
 	rml:referenceFormulation ql:XPath;
 	];
diff --git a/src/test/resources/example10/mapping.rml.ttl b/src/test/resources/example10/mapping.rml.ttl
index 7b6b937a..807728e3 100644
--- a/src/test/resources/example10/mapping.rml.ttl
+++ b/src/test/resources/example10/mapping.rml.ttl
@@ -10,7 +10,7 @@
 
 <#PersonMapping>
     rml:logicalSource [
-      rml:source "example10/persons.json";
+      rml:source "persons.json";
       rml:referenceFormulation ql:JSONPath;
       rml:iterator "$.persons[*]"
     ];
diff --git a/src/test/resources/example2-bn/example.rml.ttl b/src/test/resources/example2-bn/example.rml.ttl
index a1de1d97..f5c9c5ba 100644
--- a/src/test/resources/example2-bn/example.rml.ttl
+++ b/src/test/resources/example2-bn/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps>
     rml:logicalSource [
-        rml:source "example2-bn/example2.xml";
+        rml:source "example2.xml";
         rml:iterator "/notes/note";
         rml:referenceFormulation ql:XPath;
     ];
@@ -47,7 +47,7 @@
 
 <#DateTime>
     rml:logicalSource [
-	rml:source "example2-bn/example2.xml";
+	rml:source "example2.xml";
 	rml:iterator "/notes/note";
 	rml:referenceFormulation ql:XPath;
 	];
diff --git a/src/test/resources/example2-lang/example.rml.ttl b/src/test/resources/example2-lang/example.rml.ttl
index ea2305c6..8ddca0eb 100644
--- a/src/test/resources/example2-lang/example.rml.ttl
+++ b/src/test/resources/example2-lang/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps>
     rml:logicalSource [
-        rml:source "example2/example2.xml";
+        rml:source "example2.xml";
         rml:iterator "/notes/note";
         rml:referenceFormulation ql:XPath;
     ];
@@ -47,7 +47,7 @@
 
 <#DateTime>
     rml:logicalSource [
-	rml:source "example2/example2.xml";
+	rml:source "example2.xml";
 	rml:iterator "/notes/note";
 	rml:referenceFormulation ql:XPath;
 	];
diff --git a/src/test/resources/example2-object/example.rml.ttl b/src/test/resources/example2-object/example.rml.ttl
index 52aa5052..4d0946f3 100644
--- a/src/test/resources/example2-object/example.rml.ttl
+++ b/src/test/resources/example2-object/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps>
     rml:logicalSource [
-        rml:source "example2/example2.xml";
+        rml:source "example2.xml";
         rml:iterator "/notes/note";
         rml:referenceFormulation ql:XPath;
     ];
@@ -47,7 +47,7 @@
 
 <#DateTime>
     rml:logicalSource [
-	rml:source "example2/example2.xml";
+	rml:source "example2.xml";
 	rml:iterator "/notes/note";
 	rml:referenceFormulation ql:XPath;
 	];
diff --git a/src/test/resources/example2/example.rml.ttl b/src/test/resources/example2/example.rml.ttl
index 09b8f307..63b0f196 100755
--- a/src/test/resources/example2/example.rml.ttl
+++ b/src/test/resources/example2/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps> a rr:TriplesMap;
     rml:logicalSource [ 
-        rml:source "example2/example2.xml";
+        rml:source "example2.xml";
         rml:iterator "/notes/note";
         rml:referenceFormulation ql:XPath;
     ];
@@ -45,7 +45,7 @@
         
 <#DateTime>
     rml:logicalSource [ 
-	rml:source "example2/example2.xml" ;
+	rml:source "example2.xml" ;
 	rml:iterator "/notes/note" ;
 	rml:referenceFormulation ql:XPath ;
 	];
diff --git a/src/test/resources/example2pm/example.rml.ttl b/src/test/resources/example2pm/example.rml.ttl
index ef3fc1c1..72c4867c 100644
--- a/src/test/resources/example2pm/example.rml.ttl
+++ b/src/test/resources/example2pm/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps>
     rml:logicalSource [
-        rml:source "example2/example2.xml";
+        rml:source "example2.xml";
         rml:iterator "/notes/note";
         rml:referenceFormulation ql:XPath;
     ];
@@ -47,7 +47,7 @@
 
 <#DateTime>
     rml:logicalSource [
-	rml:source "example2/example2.xml";
+	rml:source "example2.xml";
 	rml:iterator "/notes/note";
 	rml:referenceFormulation ql:XPath;
 	];
diff --git a/src/test/resources/example3/example3.rml.ttl b/src/test/resources/example3/example3.rml.ttl
index 8f06bcdc..c19111db 100755
--- a/src/test/resources/example3/example3.rml.ttl
+++ b/src/test/resources/example3/example3.rml.ttl
@@ -24,7 +24,7 @@
 
 <#AirportMapping>
     rml:logicalSource [
-	rml:source "example3/Airport.csv";
+	rml:source "Airport.csv";
         rml:referenceFormulation ql:CSV
     ];
     rr:subjectMap [
@@ -56,7 +56,7 @@
 <#BusMapping>
 
     rml:logicalSource[
-      rml:source "example3/Transport.xml";
+      rml:source "Transport.xml";
       rml:iterator "/transport/bus";
       rml:referenceFormulation ql:XPath;
     ];
@@ -75,7 +75,7 @@
 
 <#BusStopMapping>
     rml:logicalSource [
-      rml:source "example3/Transport.xml";
+      rml:source "Transport.xml";
       rml:iterator "/transport/bus/route/stop";
       rml:referenceFormulation ql:XPath;
     ];
@@ -93,7 +93,7 @@
 
 <#VenueMapping>
     rml:logicalSource [
-      rml:source "example3/Venue.json";
+      rml:source "Venue.json";
       rml:referenceFormulation ql:JSONPath;
       rml:iterator "$"
     ];
@@ -124,7 +124,7 @@
 
 <#LocationMapping>
   rml:logicalSource [
-    rml:source "example3/Venue.json";
+    rml:source "Venue.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$"
   ];
diff --git a/src/test/resources/example4/example4_Venue.rml.ttl b/src/test/resources/example4/example4_Venue.rml.ttl
index 6b99ecde..fdcec129 100755
--- a/src/test/resources/example4/example4_Venue.rml.ttl
+++ b/src/test/resources/example4/example4_Venue.rml.ttl
@@ -17,7 +17,7 @@
 
 <#VenueMapping>
     rml:logicalSource [
-      rml:source "example4/Venue4.json";
+      rml:source "Venue4.json";
       rml:referenceFormulation ql:JSONPath;
       rml:iterator "$[*]";
     ];
diff --git a/src/test/resources/example4b/example4_Venue.rml.ttl b/src/test/resources/example4b/example4_Venue.rml.ttl
index 06e234e9..fdcec129 100644
--- a/src/test/resources/example4b/example4_Venue.rml.ttl
+++ b/src/test/resources/example4b/example4_Venue.rml.ttl
@@ -17,7 +17,7 @@
 
 <#VenueMapping>
     rml:logicalSource [
-      rml:source "example4b/Venue4.json";
+      rml:source "Venue4.json";
       rml:referenceFormulation ql:JSONPath;
       rml:iterator "$[*]";
     ];
diff --git a/src/test/resources/example6/example.rml.ttl b/src/test/resources/example6/example.rml.ttl
index 44d908e0..30c7cee9 100755
--- a/src/test/resources/example6/example.rml.ttl
+++ b/src/test/resources/example6/example.rml.ttl
@@ -8,7 +8,7 @@
 
 <#FromToMaps>
     rml:logicalSource [ 
-        rml:source "example6/example6.xml";
+        rml:source "example6.xml";
         rml:referenceFormulation ql:XPath;
         rml:iterator "/notes/note";
     ];
@@ -48,7 +48,7 @@
         
 <#DateTime>
     rml:logicalSource [ 
-	rml:source "example6/example6.xml";
+	rml:source "example6.xml";
 	rml:iterator "/notes/note";
 	rml:referenceFormulation ql:XPath;
 	];
diff --git a/src/test/resources/example8/simergy.rml.ttl b/src/test/resources/example8/simergy.rml.ttl
index d726a1db..bafd3faa 100755
--- a/src/test/resources/example8/simergy.rml.ttl
+++ b/src/test/resources/example8/simergy.rml.ttl
@@ -10,7 +10,7 @@
 <#SimModelMapping>
   rml:logicalSource
   [
-    rml:source "example8/simergy.xml" ;
+    rml:source "simergy.xml" ;
     rml:iterator "/SimModel/simmodel:SimAppLibraryDefault_AppLibraryDefault_GlobalLibrary";
     rml:referenceFormulation ql:XPath ;
   ];
diff --git a/src/test/resources/failing/RMLTC0010c-XML/mapping.ttl.bak b/src/test/resources/failing/RMLTC0010c-XML/mapping.ttl.bak
deleted file mode 100644
index 157c218f..00000000
--- a/src/test/resources/failing/RMLTC0010c-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-XML/country info.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/countries/country"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{CountryCode}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:code ;
-    rr:objectMap [ rr:template "\{\{\{ {ISO 3166} \}\}\}"; rr:termType rr:Literal]
-  ] .
diff --git a/src/test/resources/failing/RMLTC1003-CSV/mapping.ttl b/src/test/resources/failing/RMLTC1003-CSV/mapping.ttl
deleted file mode 100644
index 4c2e28e1..00000000
--- a/src/test/resources/failing/RMLTC1003-CSV/mapping.ttl
+++ /dev/null
@@ -1,29 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "http://rml.io/data/dataRetrieval/dcat/Airport.csv";
-    rml:referenceFormulation ql:CSV 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{id}" 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:city; 
-    rr:objectMap [
-      rml:reference "city"
-    ]
-  ].
-
-										
diff --git a/src/test/resources/failing/RMLTC1003-CSV/mapping.ttl.bak b/src/test/resources/failing/RMLTC1003-CSV/mapping.ttl.bak
deleted file mode 100644
index 4c2e28e1..00000000
--- a/src/test/resources/failing/RMLTC1003-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,29 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "http://rml.io/data/dataRetrieval/dcat/Airport.csv";
-    rml:referenceFormulation ql:CSV 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{id}" 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:city; 
-    rr:objectMap [
-      rml:reference "city"
-    ]
-  ].
-
-										
diff --git a/src/test/resources/failing/RMLTC1003-CSV/output.ttl b/src/test/resources/failing/RMLTC1003-CSV/output.ttl
deleted file mode 100644
index 31168c83..00000000
--- a/src/test/resources/failing/RMLTC1003-CSV/output.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example.com/6523> <http://example.com/city> "Brussels".
-<http://example.com/6524> <http://example.com/city> "Athens".
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0000-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0000-CSV/mapping.ttl
new file mode 100644
index 00000000..f5044d2c
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0000-CSV/mapping.ttl
@@ -0,0 +1,36 @@
+# Function on object, 0 parameters
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<http://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:random ] ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0000-CSV/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0000-CSV/output.ttl
new file mode 100644
index 00000000..f8633b11
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0000-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "random" .
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0011-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0011-CSV/mapping.ttl
new file mode 100644
index 00000000..f42c5c72
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0011-CSV/mapping.ttl
@@ -0,0 +1,40 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:datatype xsd:positiveInteger
+    ]
+  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-CSV/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0011-CSV/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002e-CSV/output.ttl
rename to src/test/resources/failing/fno-testcases/RMLFNOTC0011-CSV/output.ttl
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0012-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0012-CSV/mapping.ttl
new file mode 100644
index 00000000..3f04a6a1
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0012-CSV/mapping.ttl
@@ -0,0 +1,36 @@
+# Function on object returns null
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<http://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:generateNull ] ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-JSON/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0012-CSV/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002e-JSON/output.ttl
rename to src/test/resources/failing/fno-testcases/RMLFNOTC0012-CSV/output.ttl
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0014-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0014-CSV/mapping.ttl
new file mode 100644
index 00000000..502a7a3a
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0014-CSV/mapping.ttl
@@ -0,0 +1,38 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<http://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    fnml:functionValue [
+      rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+        rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      rr:predicateObjectMap [
+        rr:predicate grel:valueParameter ;
+        rr:objectMap [ rml:reference "Name" ] ]
+    ] ;
+    rr:termType rr:IRI
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"]
+  ].
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0014-CSV/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0014-CSV/output.ttl
new file mode 100644
index 00000000..33a517b5
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0014-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/base/VENUS> <http://xmlns.com/foaf/0.1/name> "Venus".
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0015-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0015-CSV/mapping.ttl
new file mode 100644
index 00000000..91a6e11e
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0015-CSV/mapping.ttl
@@ -0,0 +1,40 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<http://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicateMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ];
+    rr:objectMap [ rr:constant foaf:name ; rr:termType rr:IRI ]
+  ].
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0015-CSV/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0015-CSV/output.ttl
new file mode 100644
index 00000000..45cf0634
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0015-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <VENUS> <http://xmlns.com/foaf/0.1/name>.
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/mapping.ttl
new file mode 100644
index 00000000..6e3a5b71
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/mapping.ttl
@@ -0,0 +1,41 @@
+# Function on graph, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<http://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"] ;
+    rr:graphMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ]
+  ].
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/output.nq b/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/output.nq
new file mode 100644
index 00000000..2258872a
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://VENUS> .
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/output.ttl
new file mode 100644
index 00000000..56126792
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0016-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <VENUS>.
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/authors.json b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/authors.json
new file mode 100644
index 00000000..e2149b02
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/authors.json
@@ -0,0 +1,7 @@
+{
+  "authors": [
+    {"name": "John"},
+    {"name": "Edward"},
+    {"name": "Steve"}
+  ]
+}
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/books.json b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/books.json
new file mode 100644
index 00000000..9856321f
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/books.json
@@ -0,0 +1,8 @@
+{
+  "books": [
+    {"title": "The adventure of young turtle", "authors": ["John"]},
+    {"title": "The big rabbit's trip", "authors": ["Edward", "Steve"]},
+    {"title": "A new horizon at the end of the night", "authors": []},
+    {"title": "The past comes back in the future"}
+  ]
+}
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/mapping.ttl
new file mode 100644
index 00000000..cc73f05e
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/mapping.ttl
@@ -0,0 +1,63 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "authors.json";
+    rml:referenceFormulation ql:JSONPath;
+    rml:iterator "$.authors[*]"
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/author/{name}";
+    rr:class ex:Author
+  ].
+
+<TriplesMap2>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "books.json";
+    rml:referenceFormulation ql:JSONPath;
+    rml:iterator "$.books[*]"
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/book/{title}";
+    rr:class ex:Book
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate ex:writtenBy;
+    rr:objectMap [
+      rr:parentTriplesMap <TriplesMap1>;
+      rml:joinCondition [
+        fnml:functionValue [
+      	  rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:listContainsElement ]
+          ] ;
+      	  rr:predicateObjectMap [
+      		rr:predicate idlab-fn:list ;
+      		rr:objectMap [ rml:reference "authors"]
+          ] ;
+      	  rr:predicateObjectMap [
+      		rr:predicate idlab-fn:str ;
+      		rr:objectMap [ rml:parentTermMap [ rml:reference "name"] ]
+          ]
+        ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/output.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/output.ttl
new file mode 100644
index 00000000..9056ebab
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0020-JSON/output.ttl
@@ -0,0 +1,10 @@
+<http://example.com/author/Edward> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Author> .
+<http://example.com/author/John> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Author> .
+<http://example.com/author/Steve> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Author> .
+<http://example.com/book/A%20new%20horizon%20at%20the%20end%20of%20the%20night> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Book> .
+<http://example.com/book/The%20adventure%20of%20young%20turtle> <http://example.com/writtenBy> <http://example.com/author/John> .
+<http://example.com/book/The%20adventure%20of%20young%20turtle> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Book> .
+<http://example.com/book/The%20big%20rabbit%27s%20trip> <http://example.com/writtenBy> <http://example.com/author/Edward> .
+<http://example.com/book/The%20big%20rabbit%27s%20trip> <http://example.com/writtenBy> <http://example.com/author/Steve> .
+<http://example.com/book/The%20big%20rabbit%27s%20trip> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Book> .
+<http://example.com/book/The%20past%20comes%20back%20in%20the%20future> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Book> .
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/mapping.ttl
new file mode 100644
index 00000000..a3500a44
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/mapping.ttl
@@ -0,0 +1,39 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix grel: <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix fno: <https://w3id.org/function/ontology#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source "student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{ID}";
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:name ;
+    rr:objectMap [
+      rml:reference "Name";
+      rml:languageMap [
+         fnml:functionValue [
+          rr:predicateObjectMap [
+            rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toLowerCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+            rr:objectMap [ rml:reference "lang" ] ]
+         ]
+      ]
+    ]
+  ].
+
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/output.nq b/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/output.nq
new file mode 100644
index 00000000..9b168eab
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/output.nq
@@ -0,0 +1,3 @@
+<http://example.com/10> <http://example.com/name> "Venus"@en .
+<http://example.com/20> <http://example.com/name> "Athina"@el .
+<http://example.com/30> <http://example.com/name> "Bob"@nl .
\ No newline at end of file
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/student.csv b/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/student.csv
new file mode 100644
index 00000000..5de0934b
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0022-CSV/student.csv
@@ -0,0 +1,4 @@
+ID,Name,lang
+10,Venus,En
+20,Athina,EL
+30,Bob,nl
\ No newline at end of file
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/mapping.ttl b/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/mapping.ttl
new file mode 100644
index 00000000..b462643e
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/mapping.ttl
@@ -0,0 +1,114 @@
+@prefix ex:       <http://example.com/> .
+@prefix fnml:     <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:      <https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix rr:       <http://www.w3.org/ns/r2rml#> .
+@prefix rml:      <http://semweb.mmlab.be/ns/rml#> .
+@prefix rdf:      <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ql:       <http://semweb.mmlab.be/ns/ql#> .
+@prefix map:      <http://mapping.example.com/> .
+
+map:map_person_0
+    rml:logicalSource     map:source_0 ;
+    a                     rr:TriplesMap ;
+    rdfs:label            "person" ;
+    rr:subjectMap         map:s_0 ;
+    rr:predicateObjectMap map:pom_2 .
+
+map:source_0
+    a                        rml:LogicalSource ;
+    rml:source               "student.csv" ;
+    rml:referenceFormulation ql:CSV .
+
+map:s_0
+    a                  rr:SubjectMap, fnml:FunctionTermMap ;
+    rr:termType        rr:IRI ;
+    fnml:functionValue map:fn_0 .
+
+map:fn_0
+    rml:logicalSource     map:source_0 ;
+    rr:predicateObjectMap map:pomexec_0, map:pom_0, map:pom_1 , map:pom_3 .
+
+map:pomexec_0
+    rr:predicateMap map:pmexec_0 ;
+    rr:objectMap    map:omexec_0 .
+
+map:pmexec_0
+    rr:constant fno:executes .
+
+map:omexec_0
+    rr:constant "http://users.ugent.be/~bjdmeest/function/grel.ttl#array_join" ;
+    rr:termType rr:IRI .
+
+map:pom_0
+    a               rr:PredicateObjectMap ;
+    rr:predicateMap map:pm_0 ;
+    rr:objectMap    map:om_0 .
+
+map:pm_0
+    a           rr:PredicateMap ;
+    rr:constant grel:p_array_a .
+
+map:om_0
+    a           rr:ObjectMap ;
+    rr:constant "http://example.com/person/" ;
+    rr:termType rr:Literal .
+
+map:pom_1
+    a               rr:PredicateObjectMap ;
+    rr:predicateMap map:pm_1 ;
+    rr:objectMap    map:om_1 .
+
+map:pm_1
+    a           rr:PredicateMap ;
+    rr:constant grel:p_array_a .
+
+map:om_1
+    a                  rr:ObjectMap, fnml:FunctionTermMap ;
+    fnml:functionValue map:fn_1 .
+
+map:fn_1
+    rml:logicalSource     map:source_0 ;
+    rr:predicateObjectMap map:pomexec_1 .
+
+map:pomexec_1
+    rr:predicateMap map:pmexec_1 ;
+    rr:objectMap    map:omexec_1 .
+
+map:pmexec_1
+    rr:constant fno:executes .
+
+map:omexec_1
+    rr:constant "http://example.com/idlab/function/random" ;
+    rr:termType rr:IRI .
+
+map:pom_2
+    a               rr:PredicateObjectMap ;
+    rr:predicateMap map:pm_2 ;
+    rr:objectMap    map:om_2 .
+
+map:pm_2
+    a           rr:PredicateMap ;
+    rr:constant rdf:type .
+
+map:om_2
+    a           rr:ObjectMap ;
+    rr:constant "http://xmlns.com/foaf/0.1/Person" ;
+    rr:termType rr:IRI .
+
+# separator
+map:pom_3
+    a               rr:PredicateObjectMap ;
+    rr:predicateMap map:pm_3 ;
+    rr:objectMap    map:om_3 .
+
+map:pm_3
+    a           rr:PredicateMap ;
+    rr:constant grel:p_string_sep .
+
+map:om_3
+    a           rr:ObjectMap ;
+    rr:constant "SEPARATOOOOR" ;
+    rr:termType rr:Literal .
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/output.nq b/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/output.nq
new file mode 100644
index 00000000..346dc619
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/output.nq
@@ -0,0 +1,3 @@
+<http://example.com/person/random_string_here> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+
+<http://example.com/person/random_string_here> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
diff --git a/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/student.csv b/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/student.csv
new file mode 100644
index 00000000..0e947809
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/RMLFNOTC0023-CSV/student.csv
@@ -0,0 +1,3 @@
+name,role
+Sven,1
+Ben ,2
diff --git a/src/test/resources/failing/fno-testcases/student.csv b/src/test/resources/failing/fno-testcases/student.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/failing/fno-testcases/student.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/failing/RMLTC0009b-CSV/mapping.ttl b/src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/mapping.ttl
similarity index 96%
rename from src/test/resources/failing/RMLTC0009b-CSV/mapping.ttl
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/mapping.ttl
index 289a00bb..1aa09736 100644
--- a/src/test/resources/failing/RMLTC0009b-CSV/mapping.ttl
+++ b/src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/failing/RMLTC0009b-CSV/output.nq b/src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/output.nq
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-CSV/output.nq
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/output.nq
diff --git a/src/test/resources/failing/RMLTC0009b-CSV/sport.csv b/src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/sport.csv
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-CSV/sport.csv
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/sport.csv
diff --git a/src/test/resources/failing/RMLTC0009b-CSV/student.csv b/src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/student.csv
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-CSV/student.csv
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-CSV/student.csv
diff --git a/src/test/resources/failing/RMLTC0009b-JSON/mapping.ttl b/src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/mapping.ttl
similarity index 93%
rename from src/test/resources/failing/RMLTC0009b-JSON/mapping.ttl
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/mapping.ttl
index 47e890f1..381463cf 100644
--- a/src/test/resources/failing/RMLTC0009b-JSON/mapping.ttl
+++ b/src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
@@ -45,7 +45,7 @@
   a rr:TriplesMap;
 		
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009b-JSON/sport.json";
+    rml:source "sport.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.sports[*]"
   ];
diff --git a/src/test/resources/failing/RMLTC0009b-JSON/output.nq b/src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/output.nq
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-JSON/output.nq
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/output.nq
diff --git a/src/test/resources/failing/RMLTC0009b-JSON/sport.json b/src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/sport.json
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-JSON/sport.json
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/sport.json
diff --git a/src/test/resources/failing/RMLTC0009b-JSON/student.json b/src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/student.json
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-JSON/student.json
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-JSON/student.json
diff --git a/src/test/resources/failing/RMLTC0009b-XML/mapping.ttl b/src/test/resources/failing/rml-testcases/RMLTC0009b-XML/mapping.ttl
similarity index 93%
rename from src/test/resources/failing/RMLTC0009b-XML/mapping.ttl
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-XML/mapping.ttl
index 17d7f0c5..9b528fa9 100644
--- a/src/test/resources/failing/RMLTC0009b-XML/mapping.ttl
+++ b/src/test/resources/failing/rml-testcases/RMLTC0009b-XML/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
@@ -47,7 +47,7 @@
   a rr:TriplesMap;
 		
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009b-XML/sport.xml";
+    rml:source "sport.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/sports/sport"
   ];
diff --git a/src/test/resources/failing/RMLTC0009b-XML/output.nq b/src/test/resources/failing/rml-testcases/RMLTC0009b-XML/output.nq
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-XML/output.nq
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-XML/output.nq
diff --git a/src/test/resources/failing/RMLTC0009b-XML/sport.xml b/src/test/resources/failing/rml-testcases/RMLTC0009b-XML/sport.xml
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-XML/sport.xml
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-XML/sport.xml
diff --git a/src/test/resources/failing/RMLTC0009b-XML/student.xml b/src/test/resources/failing/rml-testcases/RMLTC0009b-XML/student.xml
similarity index 100%
rename from src/test/resources/failing/RMLTC0009b-XML/student.xml
rename to src/test/resources/failing/rml-testcases/RMLTC0009b-XML/student.xml
diff --git a/src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/country info.csv b/src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/country info.csv
new file mode 100644
index 00000000..7fa63c55
--- /dev/null
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/country info.csv	
@@ -0,0 +1,5 @@
+Country Code,Name,ISO 3166
+1,"Bolivia, Plurinational State of",BO
+2,Ireland,IE
+3,Saint Martin (French part),MF
+
diff --git a/src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl.bak b/src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/mapping.ttl
similarity index 91%
rename from src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl.bak
rename to src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/mapping.ttl
index 250a85dd..c62096a8 100644
--- a/src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl.bak
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-CSV/country info.csv";
+    rml:source "country info.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/failing/RMLTC0010c-CSV/output.ttl b/src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/output.ttl
similarity index 100%
rename from src/test/resources/failing/RMLTC0010c-CSV/output.ttl
rename to src/test/resources/failing/rml-testcases/RMLTC0010c-CSV/output.ttl
diff --git a/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/country info.json b/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/country info.json
new file mode 100644
index 00000000..4e8d578a
--- /dev/null
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/country info.json	
@@ -0,0 +1,15 @@
+{
+  "countries": [{
+    "Country Code": 1,
+    "Name":"Bolivia, Plurinational State of",
+    "ISO 3166": "BO"
+  }, {
+    "Country Code": 2,
+    "Name":"Ireland",
+    "ISO 3166": "IE"
+  }, {
+    "Country Code": 3,
+    "Name":"Saint Martin (French part)",
+    "ISO 3166": "MF"
+  }]
+}
diff --git a/src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl.bak b/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/mapping.ttl
similarity index 91%
rename from src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl.bak
rename to src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/mapping.ttl
index 04fa74dd..3cd7bd9d 100644
--- a/src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl.bak
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-JSON/country info.json";
+    rml:source "country info.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
diff --git a/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/output.ttl b/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/output.ttl
new file mode 100644
index 00000000..5c7e1080
--- /dev/null
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-JSON/output.ttl
@@ -0,0 +1,4 @@
+<http://example.com/1/Bolivia%2C%20Plurinational%20State%20of> <http://example.com/code> "{{{ BO }}}" .
+<http://example.com/2/Ireland> <http://example.com/code> "{{{ IE }}}" .
+<http://example.com/3/Saint%20Martin%20%28French%20part%29> <http://example.com/code> "{{{ MF }}}" .
+
diff --git a/src/test/resources/failing/RMLTC0010c-XML/country info.xml b/src/test/resources/failing/rml-testcases/RMLTC0010c-XML/country info.xml
similarity index 100%
rename from src/test/resources/failing/RMLTC0010c-XML/country info.xml
rename to src/test/resources/failing/rml-testcases/RMLTC0010c-XML/country info.xml
diff --git a/src/test/resources/failing/RMLTC0010c-XML/mapping.ttl b/src/test/resources/failing/rml-testcases/RMLTC0010c-XML/mapping.ttl
similarity index 91%
rename from src/test/resources/failing/RMLTC0010c-XML/mapping.ttl
rename to src/test/resources/failing/rml-testcases/RMLTC0010c-XML/mapping.ttl
index 157c218f..37c8aab2 100644
--- a/src/test/resources/failing/RMLTC0010c-XML/mapping.ttl
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-XML/country info.xml";
+    rml:source "country info.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
diff --git a/src/test/resources/failing/rml-testcases/RMLTC0010c-XML/output.ttl b/src/test/resources/failing/rml-testcases/RMLTC0010c-XML/output.ttl
new file mode 100644
index 00000000..5c7e1080
--- /dev/null
+++ b/src/test/resources/failing/rml-testcases/RMLTC0010c-XML/output.ttl
@@ -0,0 +1,4 @@
+<http://example.com/1/Bolivia%2C%20Plurinational%20State%20of> <http://example.com/code> "{{{ BO }}}" .
+<http://example.com/2/Ireland> <http://example.com/code> "{{{ IE }}}" .
+<http://example.com/3/Saint%20Martin%20%28French%20part%29> <http://example.com/code> "{{{ MF }}}" .
+
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0001-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0001-CSV/mapping.ttl
new file mode 100644
index 00000000..a4c816cc
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0001-CSV/mapping.ttl
@@ -0,0 +1,40 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0001-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0001-CSV/output.ttl
new file mode 100644
index 00000000..b0369690
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0001-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "VENUS" .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0002-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0002-CSV/mapping.ttl
new file mode 100644
index 00000000..4b0a4b90
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0002-CSV/mapping.ttl
@@ -0,0 +1,39 @@
+# Function on object, 1 constant parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rr:constant "name" ] ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0002-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0002-CSV/output.ttl
new file mode 100644
index 00000000..fb8edf94
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0002-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "NAME" .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0003-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0003-CSV/mapping.ttl
new file mode 100644
index 00000000..eda134cd
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0003-CSV/mapping.ttl
@@ -0,0 +1,42 @@
+# Function on object, 2 parameters
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:escape ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Comment" ] ] ;
+      	rr:predicateObjectMap [
+            rr:predicate grel:modeParameter ;
+            rr:objectMap [ rr:constant "html" ] ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0003-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0003-CSV/output.ttl
new file mode 100644
index 00000000..af03220c
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0003-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "A&amp;B" .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0004-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0004-CSV/mapping.ttl
new file mode 100644
index 00000000..fd98a596
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0004-CSV/mapping.ttl
@@ -0,0 +1,40 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicateMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate idlab-fn:str ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ];
+    rr:objectMap [ rr:constant foaf:name ; rr:termType rr:IRI ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0004-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0004-CSV/output.ttl
new file mode 100644
index 00000000..4aa4759e
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0004-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://VENUS> <http://xmlns.com/foaf/0.1/name> .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/mapping.ttl
new file mode 100644
index 00000000..a7fbf469
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/mapping.ttl
@@ -0,0 +1,38 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    fnml:functionValue [
+      rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+        rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+      rr:predicateObjectMap [
+        rr:predicate idlab-fn:str ;
+        rr:objectMap [ rml:reference "url" ] ]
+    ] ;
+    rr:termType rr:IRI
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/output.ttl
new file mode 100644
index 00000000..80493637
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/output.ttl
@@ -0,0 +1 @@
+<http://WWW.EXAMPLE.COM> <http://xmlns.com/foaf/0.1/name> "Venus" .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/student.csv b/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/student.csv
new file mode 100644
index 00000000..c33048c8
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0005-CSV/student.csv
@@ -0,0 +1,2 @@
+Id,Name,url
+1,Venus,www.example.com
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0006-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0006-CSV/mapping.ttl
new file mode 100644
index 00000000..bce4d84c
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0006-CSV/mapping.ttl
@@ -0,0 +1,41 @@
+# Function on graph, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"] ;
+    rr:graphMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0006-CSV/output.nq b/src/test/resources/fno-testcases/RMLFNOTC0006-CSV/output.nq
new file mode 100644
index 00000000..2258872a
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0006-CSV/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://VENUS> .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0007-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0007-CSV/mapping.ttl
new file mode 100644
index 00000000..2f1105d3
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0007-CSV/mapping.ttl
@@ -0,0 +1,39 @@
+# Function on object, 1 false reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:   <https://w3id.org/function/ontology#> .
+@prefix grel:   <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+        rr:objectMap [ rml:reference "WrongReference" ] ]
+        ]
+      ]
+    ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-XML/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0007-CSV/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002e-XML/output.ttl
rename to src/test/resources/fno-testcases/RMLFNOTC0007-CSV/output.ttl
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0008-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0008-CSV/mapping.ttl
new file mode 100644
index 00000000..a9ba63f7
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0008-CSV/mapping.ttl
@@ -0,0 +1,39 @@
+# Function on object, 1 template parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:   <https://w3id.org/function/ontology#> .
+@prefix grel:   <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+        rr:objectMap [ rr:template "Name: {Name}" ; rr:termType rr:Literal ] ]
+        ]
+      ]
+    ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0008-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0008-CSV/output.ttl
new file mode 100644
index 00000000..5b69f570
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0008-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "NAME: VENUS".
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0013-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0013-CSV/mapping.ttl
new file mode 100644
index 00000000..02a792dd
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0013-CSV/mapping.ttl
@@ -0,0 +1,39 @@
+# Function on object returns empty string
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+      rr:predicate foaf:name;
+      rr:objectMap [
+        fnml:functionValue [
+        	rr:predicateObjectMap [
+        		rr:predicate fno:executes ;
+        		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+        	rr:predicateObjectMap [
+        		rr:predicate grel:valueParameter ;
+        		rr:objectMap [ rr:constant "" ] ]
+        ]
+      ]
+    ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0013-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0013-CSV/output.ttl
new file mode 100644
index 00000000..6629e021
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0013-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "" .
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/data.csv b/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/data.csv
new file mode 100644
index 00000000..12614593
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/data.csv
@@ -0,0 +1,2 @@
+id,name
+0,ben & pieter
\ No newline at end of file
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/mapping.ttl
new file mode 100644
index 00000000..5a30cdaa
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/mapping.ttl
@@ -0,0 +1,52 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "data.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{id}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+            rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:escape ] ] ;
+        rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+            rr:objectMap [
+                fnml:functionValue [
+                    rr:predicateObjectMap [
+                        rr:predicate fno:executes ;
+                        rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+                    rr:predicateObjectMap [
+                        rr:predicate grel:valueParameter ;
+                        rr:objectMap [ rml:reference "name" ] ]
+                ]
+            ] ;
+        ];
+        rr:predicateObjectMap [
+            rr:predicate grel:modeParameter ;
+            rr:objectMap [ rr:constant "html" ] ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/output.ttl b/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/output.ttl
new file mode 100644
index 00000000..2296c1ec
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTC0018-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/0> <http://xmlns.com/foaf/0.1/name> "BEN &amp; PIETER" .
diff --git a/src/test/resources/fno-testcases/RMLFNOTCA004/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTCA004/mapping.ttl
new file mode 100644
index 00000000..377b7240
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTCA004/mapping.ttl
@@ -0,0 +1,48 @@
+# test true condition
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap [ rr:constant "true"]
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/fno-testcases/RMLFNOTCA004/output.ttl b/src/test/resources/fno-testcases/RMLFNOTCA004/output.ttl
new file mode 100644
index 00000000..de68d8c0
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTCA004/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
\ No newline at end of file
diff --git a/src/test/resources/fno-testcases/RMLFNOTCA004b/mapping.ttl b/src/test/resources/fno-testcases/RMLFNOTCA004b/mapping.ttl
new file mode 100644
index 00000000..79125db8
--- /dev/null
+++ b/src/test/resources/fno-testcases/RMLFNOTCA004b/mapping.ttl
@@ -0,0 +1,48 @@
+# test true condition
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap [ rr:constant "false"]
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-JSON/output.ttl b/src/test/resources/fno-testcases/RMLFNOTCA004b/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002g-JSON/output.ttl
rename to src/test/resources/fno-testcases/RMLFNOTCA004b/output.ttl
diff --git a/src/test/resources/fno-testcases/student.csv b/src/test/resources/fno-testcases/student.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/fno-testcases/student.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/fno-testcases/student_url.csv b/src/test/resources/fno-testcases/student_url.csv
new file mode 100644
index 00000000..c33048c8
--- /dev/null
+++ b/src/test/resources/fno-testcases/student_url.csv
@@ -0,0 +1,2 @@
+Id,Name,url
+1,Venus,www.example.com
diff --git a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl.bak b/src/test/resources/json-ld/stream/kafka/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl.bak
deleted file mode 100644
index b875af25..00000000
--- a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-CSV-STREAM/mapping.ttl.bak b/src/test/resources/json-ld/stream/kafka/RMLTC0012a-CSV-STREAM/mapping.ttl.bak
deleted file mode 100644
index b875af25..00000000
--- a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-CSV-STREAM/mapping.ttl.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl.bak b/src/test/resources/json-ld/stream/kafka/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl.bak
deleted file mode 100644
index 1acdb04b..00000000
--- a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-JSON-STREAM/mapping.ttl.bak b/src/test/resources/json-ld/stream/kafka/RMLTC0012a-JSON-STREAM/mapping.ttl.bak
deleted file mode 100644
index 09638b19..00000000
--- a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-JSON-STREAM/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-JSON/persons.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl.bak b/src/test/resources/json-ld/stream/kafka/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl.bak
deleted file mode 100644
index 76f1d43d..00000000
--- a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-XML-STREAM/mapping.ttl.bak b/src/test/resources/json-ld/stream/kafka/RMLTC0012a-XML-STREAM/mapping.ttl.bak
deleted file mode 100644
index 9e55c5d8..00000000
--- a/src/test/resources/json-ld/stream/kafka/RMLTC0012a-XML-STREAM/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-XML/persons.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl
index 2bd488ab..1abe59ff 100644
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl
+++ b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            ];
     rml:referenceFormulation ql:CSV
   ];
 	
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl.bak b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl.bak
deleted file mode 100644
index b875af25..00000000
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM-SPLIT/mapping.ttl.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl
index 2bd488ab..1abe59ff 100644
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl
+++ b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            ];
     rml:referenceFormulation ql:CSV
   ];
 	
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl.bak b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl.bak
deleted file mode 100644
index b875af25..00000000
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-CSV-STREAM/mapping.ttl.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl
index 369d197e..6e8207b0 100644
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl
+++ b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;        ];
     rml:referenceFormulation ql:JSONPath;
   ];
 	
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl.bak b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl.bak
deleted file mode 100644
index 1acdb04b..00000000
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM-SPLIT/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl
index 9c6ad611..93745d16 100644
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl
+++ b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl.bak b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl.bak
deleted file mode 100644
index 09638b19..00000000
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-JSON-STREAM/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-JSON/persons.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl
index c927b794..9c04365c 100644
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl
+++ b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;        ];
     rml:referenceFormulation ql:XPath;
   ];
 	
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl.bak b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl.bak
deleted file mode 100644
index 76f1d43d..00000000
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM-SPLIT/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl
index 226e82c3..b7c83e3e 100644
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl
+++ b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-   rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+   rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;        ];
        rml:referenceFormulation ql:XPath;
     rml:iterator "/Persons/Person"
   ];
diff --git a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl.bak b/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl.bak
deleted file mode 100644
index 9e55c5d8..00000000
--- a/src/test/resources/json-ld/stream/tcp/RMLTC0012a-XML-STREAM/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-XML/persons.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-CSV/mapping.ttl b/src/test/resources/negative_test_cases/RMLTC0002e-CSV/mapping.ttl
deleted file mode 100644
index 3e1e0deb..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002e-CSV/mapping.ttl
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002e-CSV/student2.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-CSV/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0002e-CSV/mapping.ttl.bak
deleted file mode 100644
index 41476180..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002e-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002e-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-JSON/mapping.ttl b/src/test/resources/negative_test_cases/RMLTC0002e-JSON/mapping.ttl
deleted file mode 100644
index 2df0f1a8..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002e-JSON/mapping.ttl
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002e-JSON/student2.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-JSON/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0002e-JSON/mapping.ttl.bak
deleted file mode 100644
index 170caafe..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002e-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002e-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-XML/mapping.ttl b/src/test/resources/negative_test_cases/RMLTC0002e-XML/mapping.ttl
deleted file mode 100644
index 267c50ef..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002e-XML/mapping.ttl
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002e-XML/student2.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-XML/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0002e-XML/mapping.ttl.bak
deleted file mode 100644
index 4289256e..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002e-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002e-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-JSON/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0002g-JSON/mapping.ttl.bak
deleted file mode 100644
index 41f6a2a0..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002g-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,23 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002g-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-XML/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0002g-XML/mapping.ttl.bak
deleted file mode 100644
index 4237f611..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0002g-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,23 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002g-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "$"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
-  ].
-
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-JSON/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0004b-JSON/mapping.ttl.bak
deleted file mode 100644
index dc592ce2..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0004b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0004b-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Name}";
-    rr:termType rr:Literal 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
-
-										
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-XML/mapping.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0004b-XML/mapping.ttl.bak
deleted file mode 100644
index fda50028..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0004b-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0004b-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Name}";
-    rr:termType rr:Literal 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
-
-										
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-CSV/mapping.rml.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0012c-CSV/mapping.rml.ttl.bak
deleted file mode 100644
index 6327da79..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0012c-CSV/mapping.rml.ttl.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012c-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:predicateObjectMap [
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-JSON/mapping.rml.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0012c-JSON/mapping.rml.ttl.bak
deleted file mode 100644
index f7cb6100..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0012c-JSON/mapping.rml.ttl.bak
+++ /dev/null
@@ -1,32 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012c-JSON/persons.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:predicateObjectMap [
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-XML/mapping.rml.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0012c-XML/mapping.rml.ttl.bak
deleted file mode 100644
index bc6b936e..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0012c-XML/mapping.rml.ttl.bak
+++ /dev/null
@@ -1,32 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .qsdfqsdf
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012c-XML/persons.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:predicateObjectMap [
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-CSV/mapping.rml.ttl b/src/test/resources/negative_test_cases/RMLTC0012d-CSV/mapping.rml.ttl
deleted file mode 100644
index 5aea6805..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0012d-CSV/mapping.rml.ttl
+++ /dev/null
@@ -1,36 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012d-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-
-  rr:subjectMap [ rr:template "{fname}_{lname}_{amount}"; rr:termType rr:BlankNode; ];
-
-  rr:subjectMap [ rr:template "{amount}_{fname}_{lname}"; rr:termType rr:BlankNode; ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-JSON/mapping.rml.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0012d-JSON/mapping.rml.ttl.bak
deleted file mode 100644
index 2441221d..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0012d-JSON/mapping.rml.ttl.bak
+++ /dev/null
@@ -1,36 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012d-JSON/persons.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}_{lname}_{amount}"; rr:termType rr:BlankNode; ];
-
-  rr:subjectMap [ rr:template "{amount}_{fname}_{lname}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-XML/mapping.rml.ttl.bak b/src/test/resources/negative_test_cases/RMLTC0012d-XML/mapping.rml.ttl.bak
deleted file mode 100644
index 38e6f34e..00000000
--- a/src/test/resources/negative_test_cases/RMLTC0012d-XML/mapping.rml.ttl.bak
+++ /dev/null
@@ -1,36 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012d-XML/persons.json";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}_{lname}_{amount}"; rr:termType rr:BlankNode; ];
-
-  rr:subjectMap [ rr:template "{amount}_{fname}_{lname}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl.bak b/src/test/resources/relative_paths/scenario01/RMLTC0001a-CSV/mapping.ttl
similarity index 91%
rename from src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl.bak
rename to src/test/resources/relative_paths/scenario01/RMLTC0001a-CSV/mapping.ttl
index 251574db..7535dc02 100644
--- a/src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl.bak
+++ b/src/test/resources/relative_paths/scenario01/RMLTC0001a-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0001a-CSV/student.csv";
+    rml:source "../student.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
diff --git a/src/test/resources/relative_paths/scenario01/RMLTC0001a-CSV/output.ttl b/src/test/resources/relative_paths/scenario01/RMLTC0001a-CSV/output.ttl
new file mode 100644
index 00000000..73f40ddf
--- /dev/null
+++ b/src/test/resources/relative_paths/scenario01/RMLTC0001a-CSV/output.ttl
@@ -0,0 +1,2 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-CSV/student.csv b/src/test/resources/relative_paths/scenario01/student.csv
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0004b-CSV/student.csv
rename to src/test/resources/relative_paths/scenario01/student.csv
diff --git a/src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl.bak b/src/test/resources/relative_paths/scenario02/RMLTC0001a-CSV/mapping.ttl
similarity index 80%
rename from src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl.bak
rename to src/test/resources/relative_paths/scenario02/RMLTC0001a-CSV/mapping.ttl
index 2f62685a..af23d810 100644
--- a/src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl.bak
+++ b/src/test/resources/relative_paths/scenario02/RMLTC0001a-CSV/mapping.ttl
@@ -11,9 +11,8 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0001a-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
+    rml:source "../data/student.csv";
+    rml:referenceFormulation ql:CSV 
   ];
 
   rr:subjectMap [ 
diff --git a/src/test/resources/relative_paths/scenario02/RMLTC0001a-CSV/output.ttl b/src/test/resources/relative_paths/scenario02/RMLTC0001a-CSV/output.ttl
new file mode 100644
index 00000000..73f40ddf
--- /dev/null
+++ b/src/test/resources/relative_paths/scenario02/RMLTC0001a-CSV/output.ttl
@@ -0,0 +1,2 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+
diff --git a/src/test/resources/relative_paths/scenario02/data/student.csv b/src/test/resources/relative_paths/scenario02/data/student.csv
new file mode 100644
index 00000000..4e683bbe
--- /dev/null
+++ b/src/test/resources/relative_paths/scenario02/data/student.csv
@@ -0,0 +1,2 @@
+Name
+Venus
diff --git a/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/data/student.csv b/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/data/student.csv
new file mode 100644
index 00000000..4e683bbe
--- /dev/null
+++ b/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/data/student.csv
@@ -0,0 +1,2 @@
+Name
+Venus
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-CSV/mapping.ttl.bak b/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/mapping.ttl
similarity index 80%
rename from src/test/resources/negative_test_cases/RMLTC0004b-CSV/mapping.ttl.bak
rename to src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/mapping.ttl
index af1f39a6..03235d1a 100644
--- a/src/test/resources/negative_test_cases/RMLTC0004b-CSV/mapping.ttl.bak
+++ b/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/mapping.ttl
@@ -11,13 +11,12 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0004b-CSV/student.csv";
+    rml:source "data/student.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
   rr:subjectMap [ 
-    rr:template "http://example.com/{Name}";
-    rr:termType rr:Literal
+    rr:template "http://example.com/{Name}" 
   ]; 
 	
   rr:predicateObjectMap [ 
diff --git a/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/output.ttl b/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/output.ttl
new file mode 100644
index 00000000..73f40ddf
--- /dev/null
+++ b/src/test/resources/relative_paths/scenario03/RMLTC0001a-CSV/output.ttl
@@ -0,0 +1,2 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+
diff --git a/src/test/resources/report/static-fno/result.csv b/src/test/resources/report/static-fno/result.csv
new file mode 100644
index 00000000..e941b368
--- /dev/null
+++ b/src/test/resources/report/static-fno/result.csv
@@ -0,0 +1,30 @@
+testid,result
+RMLFNOTC0000-CSV,failed
+RMLFNOTC0001-CSV,passed
+RMLFNOTC0002-CSV,passed
+RMLFNOTC0003-CSV,passed
+RMLFNOTC0004-CSV,passed
+RMLFNOTC0005-CSV,passed
+RMLFNOTC0006-CSV,passed
+RMLFNOTC0007-CSV,passed
+RMLFNOTC0008-CSV,passed
+RMLFNOTC0009-CSV,failed
+RMLFNOTC0010-CSV,failed
+RMLFNOTC0011-CSV,failed
+RMLFNOTC0012-CSV,failed
+RMLFNOTC0013-CSV,passed
+RMLFNOTC0014-CSV,failed
+RMLFNOTC0015-CSV,failed
+RMLFNOTC0016-CSV,failed
+RMLFNOTC0017-CSV,failed
+RMLFNOTC0018-CSV,passed
+RMLFNOTC0019-CSV,failed
+RMLFNOTC0020-JSON,failed
+RMLFNOTC0021-JSON,failed
+RMLFNOTC0022-CSV,failed
+RMLFNOTC0023-CSV,failed
+RMLFNOTCA001,failed
+RMLFNOTCA004,passed
+RMLFNOTCA004b,passed
+RMLFNOTCA005,failed
+RMLFNOTCA006,failed
diff --git a/src/test/resources/report/static/result.csv b/src/test/resources/report/static/result.csv
index 4d3f8064..1d3bcb7a 100644
--- a/src/test/resources/report/static/result.csv
+++ b/src/test/resources/report/static/result.csv
@@ -1,58 +1,58 @@
 testid,result
-RMLTC0000-CSV,passing
-RMLTC0000-JSON,passing
+RMLTC0000-CSV,passed
+RMLTC0000-JSON,passed
 RMLTC0000-MySQL,inapplicable
 RMLTC0000-PostgreSQL,inapplicable
 RMLTC0000-SPARQL,inapplicable
 RMLTC0000-SQLServer,inapplicable
-RMLTC0000-XML,passing
-RMLTC0001a-CSV,passing
-RMLTC0001a-JSON,passing
+RMLTC0000-XML,passed
+RMLTC0001a-CSV,passed
+RMLTC0001a-JSON,passed
 RMLTC0001a-MySQL,inapplicable
 RMLTC0001a-PostgreSQL,inapplicable
 RMLTC0001a-SPARQL,inapplicable
 RMLTC0001a-SQLServer,inapplicable
-RMLTC0001a-XML,passing
-RMLTC0001b-CSV,passing
-RMLTC0001b-JSON,passing
+RMLTC0001a-XML,passed
+RMLTC0001b-CSV,passed
+RMLTC0001b-JSON,passed
 RMLTC0001b-MySQL,inapplicable
 RMLTC0001b-PostgreSQL,inapplicable
 RMLTC0001b-SPARQL,inapplicable
 RMLTC0001b-SQLServer,inapplicable
-RMLTC0001b-XML,passing
-RMLTC0002a-CSV,passing
-RMLTC0002a-JSON,passing
+RMLTC0001b-XML,passed
+RMLTC0002a-CSV,passed
+RMLTC0002a-JSON,passed
 RMLTC0002a-MySQL,inapplicable
 RMLTC0002a-PostgreSQL,inapplicable
 RMLTC0002a-SPARQL,inapplicable
 RMLTC0002a-SQLServer,inapplicable
-RMLTC0002a-XML,passing
-RMLTC0002b-CSV,passing
-RMLTC0002b-JSON,passing
+RMLTC0002a-XML,passed
+RMLTC0002b-CSV,passed
+RMLTC0002b-JSON,passed
 RMLTC0002b-MySQL,inapplicable
 RMLTC0002b-PostgreSQL,inapplicable
 RMLTC0002b-SPARQL,inapplicable
 RMLTC0002b-SQLServer,inapplicable
-RMLTC0002b-XML,passing
-RMLTC0002c-CSV,passing
-RMLTC0002c-JSON,passing
+RMLTC0002b-XML,passed
+RMLTC0002c-CSV,passed
+RMLTC0002c-JSON,passed
 RMLTC0002c-MySQL,inapplicable
 RMLTC0002c-PostgreSQL,inapplicable
 RMLTC0002c-SQLServer,inapplicable
-RMLTC0002c-XML,passing
+RMLTC0002c-XML,passed
 RMLTC0002d-MySQL,inapplicable
 RMLTC0002d-PostgreSQL,inapplicable
 RMLTC0002d-SQLServer,inapplicable
-RMLTC0002e-CSV,passing
-RMLTC0002e-JSON,passing
+RMLTC0002e-CSV,passed
+RMLTC0002e-JSON,passed
 RMLTC0002e-MySQL,inapplicable
 RMLTC0002e-PostgreSQL,inapplicable
 RMLTC0002e-SQLServer,inapplicable
-RMLTC0002e-XML,passing
+RMLTC0002e-XML,passed
 RMLTC0002f-MySQL,inapplicable
 RMLTC0002f-PostgreSQL,inapplicable
 RMLTC0002f-SQLServer,inapplicable
-RMLTC0002g-JSON,passing
+RMLTC0002g-JSON,passed
 RMLTC0002g-MySQL,inapplicable
 RMLTC0002g-PostgreSQL,inapplicable
 RMLTC0002g-SPARQL,inapplicable
@@ -73,214 +73,214 @@ RMLTC0003a-SQLServer,inapplicable
 RMLTC0003b-MySQL,inapplicable
 RMLTC0003b-PostgreSQL,inapplicable
 RMLTC0003b-SQLServer,inapplicable
-RMLTC0003c-CSV,passing
-RMLTC0003c-JSON,passing
+RMLTC0003c-CSV,passed
+RMLTC0003c-JSON,passed
 RMLTC0003c-MySQL,inapplicable
 RMLTC0003c-PostgreSQL,inapplicable
 RMLTC0003c-SPARQL,inapplicable
 RMLTC0003c-SQLServer,inapplicable
-RMLTC0003c-XML,passing
-RMLTC0004a-CSV,passing
-RMLTC0004a-JSON,passing
+RMLTC0003c-XML,passed
+RMLTC0004a-CSV,passed
+RMLTC0004a-JSON,passed
 RMLTC0004a-MySQL,inapplicable
 RMLTC0004a-PostgreSQL,inapplicable
 RMLTC0004a-SPARQL,inapplicable
 RMLTC0004a-SQLServer,inapplicable
-RMLTC0004a-XML,passing
-RMLTC0004b-CSV,passing
-RMLTC0004b-JSON,passing
+RMLTC0004a-XML,passed
+RMLTC0004b-CSV,passed
+RMLTC0004b-JSON,passed
 RMLTC0004b-MySQL,inapplicable
 RMLTC0004b-PostgreSQL,inapplicable
 RMLTC0004b-SPARQL,inapplicable
 RMLTC0004b-SQLServer,inapplicable
-RMLTC0004b-XML,passing
-RMLTC0005a-CSV,passing
-RMLTC0005a-JSON,passing
+RMLTC0004b-XML,passed
+RMLTC0005a-CSV,passed
+RMLTC0005a-JSON,passed
 RMLTC0005a-MySQL,inapplicable
 RMLTC0005a-PostgreSQL,inapplicable
 RMLTC0005a-SQLServer,inapplicable
-RMLTC0005a-XML,passing
+RMLTC0005a-XML,passed
 RMLTC0005b-MySQL,inapplicable
 RMLTC0005b-PostgreSQL,inapplicable
 RMLTC0005b-SQLServer,inapplicable
-RMLTC0006a-CSV,passing
-RMLTC0006a-JSON,passing
+RMLTC0006a-CSV,passed
+RMLTC0006a-JSON,passed
 RMLTC0006a-MySQL,inapplicable
 RMLTC0006a-PostgreSQL,inapplicable
 RMLTC0006a-SPARQL,inapplicable
 RMLTC0006a-SQLServer,inapplicable
-RMLTC0006a-XML,passing
-RMLTC0007a-CSV,passing
-RMLTC0007a-JSON,passing
+RMLTC0006a-XML,passed
+RMLTC0007a-CSV,passed
+RMLTC0007a-JSON,passed
 RMLTC0007a-MySQL,inapplicable
 RMLTC0007a-PostgreSQL,inapplicable
 RMLTC0007a-SPARQL,inapplicable
 RMLTC0007a-SQLServer,inapplicable
-RMLTC0007a-XML,passing
-RMLTC0007b-CSV,passing
-RMLTC0007b-JSON,passing
+RMLTC0007a-XML,passed
+RMLTC0007b-CSV,passed
+RMLTC0007b-JSON,passed
 RMLTC0007b-MySQL,inapplicable
 RMLTC0007b-PostgreSQL,inapplicable
 RMLTC0007b-SPARQL,inapplicable
 RMLTC0007b-SQLServer,inapplicable
-RMLTC0007b-XML,passing
-RMLTC0007c-CSV,passing
-RMLTC0007c-JSON,passing
+RMLTC0007b-XML,passed
+RMLTC0007c-CSV,passed
+RMLTC0007c-JSON,passed
 RMLTC0007c-MySQL,inapplicable
 RMLTC0007c-PostgreSQL,inapplicable
 RMLTC0007c-SPARQL,inapplicable
 RMLTC0007c-SQLServer,inapplicable
-RMLTC0007c-XML,passing
-RMLTC0007d-CSV,passing
-RMLTC0007d-JSON,passing
+RMLTC0007c-XML,passed
+RMLTC0007d-CSV,passed
+RMLTC0007d-JSON,passed
 RMLTC0007d-MySQL,inapplicable
 RMLTC0007d-PostgreSQL,inapplicable
 RMLTC0007d-SPARQL,inapplicable
 RMLTC0007d-SQLServer,inapplicable
-RMLTC0007d-XML,passing
-RMLTC0007e-CSV,passing
-RMLTC0007e-JSON,passing
+RMLTC0007d-XML,passed
+RMLTC0007e-CSV,passed
+RMLTC0007e-JSON,passed
 RMLTC0007e-MySQL,inapplicable
 RMLTC0007e-PostgreSQL,inapplicable
 RMLTC0007e-SPARQL,inapplicable
 RMLTC0007e-SQLServer,inapplicable
-RMLTC0007e-XML,passing
-RMLTC0007f-CSV,passing
-RMLTC0007f-JSON,passing
+RMLTC0007e-XML,passed
+RMLTC0007f-CSV,passed
+RMLTC0007f-JSON,passed
 RMLTC0007f-MySQL,inapplicable
 RMLTC0007f-PostgreSQL,inapplicable
 RMLTC0007f-SPARQL,inapplicable
 RMLTC0007f-SQLServer,inapplicable
-RMLTC0007f-XML,passing
-RMLTC0007g-CSV,passing
-RMLTC0007g-JSON,passing
+RMLTC0007f-XML,passed
+RMLTC0007g-CSV,passed
+RMLTC0007g-JSON,passed
 RMLTC0007g-MySQL,inapplicable
 RMLTC0007g-PostgreSQL,inapplicable
 RMLTC0007g-SPARQL,inapplicable
 RMLTC0007g-SQLServer,inapplicable
-RMLTC0007g-XML,passing
-RMLTC0007h-CSV,passing
-RMLTC0007h-JSON,passing
+RMLTC0007g-XML,passed
+RMLTC0007h-CSV,passed
+RMLTC0007h-JSON,passed
 RMLTC0007h-MySQL,inapplicable
 RMLTC0007h-PostgreSQL,inapplicable
 RMLTC0007h-SPARQL,inapplicable
 RMLTC0007h-SQLServer,inapplicable
-RMLTC0007h-XML,passing
-RMLTC0008a-CSV,passing
-RMLTC0008a-JSON,passing
+RMLTC0007h-XML,passed
+RMLTC0008a-CSV,passed
+RMLTC0008a-JSON,passed
 RMLTC0008a-MySQL,inapplicable
 RMLTC0008a-PostgreSQL,inapplicable
 RMLTC0008a-SPARQL,inapplicable
 RMLTC0008a-SQLServer,inapplicable
-RMLTC0008a-XML,passing
-RMLTC0008b-CSV,passing
-RMLTC0008b-JSON,passing
+RMLTC0008a-XML,passed
+RMLTC0008b-CSV,passed
+RMLTC0008b-JSON,passed
 RMLTC0008b-MySQL,inapplicable
 RMLTC0008b-PostgreSQL,inapplicable
 RMLTC0008b-SPARQL,inapplicable
 RMLTC0008b-SQLServer,inapplicable
-RMLTC0008b-XML,passing
-RMLTC0008c-CSV,passing
-RMLTC0008c-JSON,passing
+RMLTC0008b-XML,passed
+RMLTC0008c-CSV,passed
+RMLTC0008c-JSON,passed
 RMLTC0008c-MySQL,inapplicable
 RMLTC0008c-PostgreSQL,inapplicable
 RMLTC0008c-SPARQL,inapplicable
 RMLTC0008c-SQLServer,inapplicable
-RMLTC0008c-XML,passing
-RMLTC0009a-CSV,passing
-RMLTC0009a-JSON,passing
+RMLTC0008c-XML,passed
+RMLTC0009a-CSV,passed
+RMLTC0009a-JSON,passed
 RMLTC0009a-MySQL,inapplicable
 RMLTC0009a-PostgreSQL,inapplicable
 RMLTC0009a-SPARQL,inapplicable
 RMLTC0009a-SQLServer,inapplicable
-RMLTC0009a-XML,passing
-RMLTC0009b-CSV,passing
-RMLTC0009b-JSON,passing
+RMLTC0009a-XML,passed
+RMLTC0009b-CSV,passed
+RMLTC0009b-JSON,passed
 RMLTC0009b-MySQL,inapplicable
 RMLTC0009b-PostgreSQL,inapplicable
 RMLTC0009b-SPARQL,inapplicable
 RMLTC0009b-SQLServer,inapplicable
-RMLTC0009b-XML,passing
+RMLTC0009b-XML,passed
 RMLTC0009c-MySQL,inapplicable
 RMLTC0009c-PostgreSQL,inapplicable
 RMLTC0009c-SQLServer,inapplicable
 RMLTC0009d-MySQL,inapplicable
 RMLTC0009d-PostgreSQL,inapplicable
 RMLTC0009d-SQLServer,inapplicable
-RMLTC0010a-CSV,passing
-RMLTC0010a-JSON,passing
+RMLTC0010a-CSV,passed
+RMLTC0010a-JSON,passed
 RMLTC0010a-MySQL,inapplicable
 RMLTC0010a-PostgreSQL,inapplicable
 RMLTC0010a-SQLServer,inapplicable
-RMLTC0010b-CSV,passing
-RMLTC0010b-JSON,passing
+RMLTC0010b-CSV,passed
+RMLTC0010b-JSON,passed
 RMLTC0010b-MySQL,inapplicable
 RMLTC0010b-PostgreSQL,inapplicable
 RMLTC0010b-SQLServer,inapplicable
-RMLTC0010b-XML,passing
-RMLTC0010c-CSV,failed
-RMLTC0010c-JSON,failed
+RMLTC0010b-XML,passed
+RMLTC0010c-CSV,passed
+RMLTC0010c-JSON,passed
 RMLTC0010c-MySQL,inapplicable
 RMLTC0010c-PostgreSQL,inapplicable
 RMLTC0010c-SQLServer,inapplicable
-RMLTC0010c-XML,failed
+RMLTC0010c-XML,passed
 RMLTC0011a-MySQL,inapplicable
 RMLTC0011a-PostgreSQL,inapplicable
 RMLTC0011a-SQLServer,inapplicable
-RMLTC0011b-CSV,passing
-RMLTC0011b-JSON,passing
+RMLTC0011b-CSV,passed
+RMLTC0011b-JSON,passed
 RMLTC0011b-MySQL,inapplicable
 RMLTC0011b-PostgreSQL,inapplicable
 RMLTC0011b-SQLServer,inapplicable
-RMLTC0011b-XML,passing
-RMLTC0012a-CSV,passing
-RMLTC0012a-JSON,passing
+RMLTC0011b-XML,passed
+RMLTC0012a-CSV,passed
+RMLTC0012a-JSON,passed
 RMLTC0012a-MySQL,inapplicable
 RMLTC0012a-PostgreSQL,inapplicable
 RMLTC0012a-SPARQL,inapplicable
 RMLTC0012a-SQLServer,inapplicable
-RMLTC0012a-XML,passing
-RMLTC0012b-CSV,passing
-RMLTC0012b-JSON,passing
+RMLTC0012a-XML,passed
+RMLTC0012b-CSV,passed
+RMLTC0012b-JSON,passed
 RMLTC0012b-MySQL,inapplicable
 RMLTC0012b-PostgreSQL,inapplicable
 RMLTC0012b-SPARQL,inapplicable
 RMLTC0012b-SQLServer,inapplicable
-RMLTC0012b-XML,passing
-RMLTC0012c-CSV,passing
-RMLTC0012c-JSON,passing
+RMLTC0012b-XML,passed
+RMLTC0012c-CSV,passed
+RMLTC0012c-JSON,passed
 RMLTC0012c-MySQL,inapplicable
 RMLTC0012c-PostgreSQL,inapplicable
 RMLTC0012c-SQLServer,inapplicable
-RMLTC0012c-XML,passing
-RMLTC0012d-CSV,passing
-RMLTC0012d-JSON,passing
+RMLTC0012c-XML,passed
+RMLTC0012d-CSV,passed
+RMLTC0012d-JSON,passed
 RMLTC0012d-MySQL,inapplicable
 RMLTC0012d-PostgreSQL,inapplicable
 RMLTC0012d-SQLServer,inapplicable
-RMLTC0012d-XML,passing
+RMLTC0012d-XML,passed
 RMLTC0012e-MySQL,inapplicable
 RMLTC0012e-PostgreSQL,inapplicable
 RMLTC0012e-SQLServer,inapplicable
-RMLTC0013a-JSON,passing
+RMLTC0013a-JSON,passed
 RMLTC0013a-MySQL,inapplicable
 RMLTC0013a-PostgreSQL,inapplicable
 RMLTC0013a-SQLServer,inapplicable
 RMLTC0014d-MySQL,inapplicable
 RMLTC0014d-PostgreSQL,inapplicable
 RMLTC0014d-SQLServer,inapplicable
-RMLTC0015a-CSV,passing
-RMLTC0015a-JSON,passing
+RMLTC0015a-CSV,passed
+RMLTC0015a-JSON,passed
 RMLTC0015a-MySQL,inapplicable
 RMLTC0015a-PostgreSQL,inapplicable
 RMLTC0015a-SQLServer,inapplicable
-RMLTC0015a-XML,passing
-RMLTC0015b-CSV,passing
-RMLTC0015b-JSON,passing
+RMLTC0015a-XML,passed
+RMLTC0015b-CSV,passed
+RMLTC0015b-JSON,passed
 RMLTC0015b-MySQL,inapplicable
 RMLTC0015b-PostgreSQL,inapplicable
 RMLTC0015b-SQLServer,inapplicable
-RMLTC0015b-XML,passing
+RMLTC0015b-XML,passed
 RMLTC0016a-MySQL,inapplicable
 RMLTC0016a-PostgreSQL,inapplicable
 RMLTC0016a-SQLServer,inapplicable
@@ -299,27 +299,27 @@ RMLTC0016e-SQLServer,inapplicable
 RMLTC0018a-MySQL,inapplicable
 RMLTC0018a-PostgreSQL,inapplicable
 RMLTC0018a-SQLServer,inapplicable
-RMLTC0019a-CSV,passing
-RMLTC0019a-JSON,passing
+RMLTC0019a-CSV,passed
+RMLTC0019a-JSON,passed
 RMLTC0019a-MySQL,inapplicable
 RMLTC0019a-PostgreSQL,inapplicable
 RMLTC0019a-SQLServer,inapplicable
-RMLTC0019a-XML,passing
-RMLTC0019b-CSV,passing
-RMLTC0019b-JSON,passing
+RMLTC0019a-XML,passed
+RMLTC0019b-CSV,passed
+RMLTC0019b-JSON,passed
 RMLTC0019b-MySQL,inapplicable
 RMLTC0019b-PostgreSQL,inapplicable
 RMLTC0019b-SQLServer,inapplicable
-RMLTC0019b-XML,passing
-RMLTC0020a-CSV,passing
-RMLTC0020a-JSON,passing
+RMLTC0019b-XML,passed
+RMLTC0020a-CSV,passed
+RMLTC0020a-JSON,passed
 RMLTC0020a-MySQL,inapplicable
 RMLTC0020a-PostgreSQL,inapplicable
 RMLTC0020a-SQLServer,inapplicable
-RMLTC0020a-XML,passing
-RMLTC0020b-CSV,passing
-RMLTC0020b-JSON,passing
+RMLTC0020a-XML,passed
+RMLTC0020b-CSV,passed
+RMLTC0020b-JSON,passed
 RMLTC0020b-MySQL,inapplicable
 RMLTC0020b-PostgreSQL,inapplicable
 RMLTC0020b-SQLServer,inapplicable
-RMLTC0020b-XML,passing
+RMLTC0020b-XML,passed
diff --git a/src/test/resources/report/stream-fno/result.csv b/src/test/resources/report/stream-fno/result.csv
new file mode 100644
index 00000000..e941b368
--- /dev/null
+++ b/src/test/resources/report/stream-fno/result.csv
@@ -0,0 +1,30 @@
+testid,result
+RMLFNOTC0000-CSV,failed
+RMLFNOTC0001-CSV,passed
+RMLFNOTC0002-CSV,passed
+RMLFNOTC0003-CSV,passed
+RMLFNOTC0004-CSV,passed
+RMLFNOTC0005-CSV,passed
+RMLFNOTC0006-CSV,passed
+RMLFNOTC0007-CSV,passed
+RMLFNOTC0008-CSV,passed
+RMLFNOTC0009-CSV,failed
+RMLFNOTC0010-CSV,failed
+RMLFNOTC0011-CSV,failed
+RMLFNOTC0012-CSV,failed
+RMLFNOTC0013-CSV,passed
+RMLFNOTC0014-CSV,failed
+RMLFNOTC0015-CSV,failed
+RMLFNOTC0016-CSV,failed
+RMLFNOTC0017-CSV,failed
+RMLFNOTC0018-CSV,passed
+RMLFNOTC0019-CSV,failed
+RMLFNOTC0020-JSON,failed
+RMLFNOTC0021-JSON,failed
+RMLFNOTC0022-CSV,failed
+RMLFNOTC0023-CSV,failed
+RMLFNOTCA001,failed
+RMLFNOTCA004,passed
+RMLFNOTCA004b,passed
+RMLFNOTCA005,failed
+RMLFNOTCA006,failed
diff --git a/src/test/resources/report/stream/result.csv b/src/test/resources/report/stream/result.csv
index 35d5da09..1d3bcb7a 100644
--- a/src/test/resources/report/stream/result.csv
+++ b/src/test/resources/report/stream/result.csv
@@ -1,58 +1,58 @@
 testid,result
-RMLTC0000-CSV,passing
-RMLTC0000-JSON,passing
+RMLTC0000-CSV,passed
+RMLTC0000-JSON,passed
 RMLTC0000-MySQL,inapplicable
 RMLTC0000-PostgreSQL,inapplicable
 RMLTC0000-SPARQL,inapplicable
 RMLTC0000-SQLServer,inapplicable
-RMLTC0000-XML,passing
-RMLTC0001a-CSV,passing
-RMLTC0001a-JSON,passing
+RMLTC0000-XML,passed
+RMLTC0001a-CSV,passed
+RMLTC0001a-JSON,passed
 RMLTC0001a-MySQL,inapplicable
 RMLTC0001a-PostgreSQL,inapplicable
 RMLTC0001a-SPARQL,inapplicable
 RMLTC0001a-SQLServer,inapplicable
-RMLTC0001a-XML,passing
-RMLTC0001b-CSV,passing
-RMLTC0001b-JSON,passing
+RMLTC0001a-XML,passed
+RMLTC0001b-CSV,passed
+RMLTC0001b-JSON,passed
 RMLTC0001b-MySQL,inapplicable
 RMLTC0001b-PostgreSQL,inapplicable
 RMLTC0001b-SPARQL,inapplicable
 RMLTC0001b-SQLServer,inapplicable
-RMLTC0001b-XML,passing
-RMLTC0002a-CSV,passing
-RMLTC0002a-JSON,passing
+RMLTC0001b-XML,passed
+RMLTC0002a-CSV,passed
+RMLTC0002a-JSON,passed
 RMLTC0002a-MySQL,inapplicable
 RMLTC0002a-PostgreSQL,inapplicable
 RMLTC0002a-SPARQL,inapplicable
 RMLTC0002a-SQLServer,inapplicable
-RMLTC0002a-XML,passing
-RMLTC0002b-CSV,passing
-RMLTC0002b-JSON,passing
+RMLTC0002a-XML,passed
+RMLTC0002b-CSV,passed
+RMLTC0002b-JSON,passed
 RMLTC0002b-MySQL,inapplicable
 RMLTC0002b-PostgreSQL,inapplicable
 RMLTC0002b-SPARQL,inapplicable
 RMLTC0002b-SQLServer,inapplicable
-RMLTC0002b-XML,passing
-RMLTC0002c-CSV,passing
-RMLTC0002c-JSON,passing
+RMLTC0002b-XML,passed
+RMLTC0002c-CSV,passed
+RMLTC0002c-JSON,passed
 RMLTC0002c-MySQL,inapplicable
 RMLTC0002c-PostgreSQL,inapplicable
 RMLTC0002c-SQLServer,inapplicable
-RMLTC0002c-XML,passing
+RMLTC0002c-XML,passed
 RMLTC0002d-MySQL,inapplicable
 RMLTC0002d-PostgreSQL,inapplicable
 RMLTC0002d-SQLServer,inapplicable
-RMLTC0002e-CSV,passing
-RMLTC0002e-JSON,passing
+RMLTC0002e-CSV,passed
+RMLTC0002e-JSON,passed
 RMLTC0002e-MySQL,inapplicable
 RMLTC0002e-PostgreSQL,inapplicable
 RMLTC0002e-SQLServer,inapplicable
-RMLTC0002e-XML,passing
+RMLTC0002e-XML,passed
 RMLTC0002f-MySQL,inapplicable
 RMLTC0002f-PostgreSQL,inapplicable
 RMLTC0002f-SQLServer,inapplicable
-RMLTC0002g-JSON,passing
+RMLTC0002g-JSON,passed
 RMLTC0002g-MySQL,inapplicable
 RMLTC0002g-PostgreSQL,inapplicable
 RMLTC0002g-SPARQL,inapplicable
@@ -73,214 +73,214 @@ RMLTC0003a-SQLServer,inapplicable
 RMLTC0003b-MySQL,inapplicable
 RMLTC0003b-PostgreSQL,inapplicable
 RMLTC0003b-SQLServer,inapplicable
-RMLTC0003c-CSV,passing
-RMLTC0003c-JSON,passing
+RMLTC0003c-CSV,passed
+RMLTC0003c-JSON,passed
 RMLTC0003c-MySQL,inapplicable
 RMLTC0003c-PostgreSQL,inapplicable
 RMLTC0003c-SPARQL,inapplicable
 RMLTC0003c-SQLServer,inapplicable
-RMLTC0003c-XML,passing
-RMLTC0004a-CSV,passing
-RMLTC0004a-JSON,passing
+RMLTC0003c-XML,passed
+RMLTC0004a-CSV,passed
+RMLTC0004a-JSON,passed
 RMLTC0004a-MySQL,inapplicable
 RMLTC0004a-PostgreSQL,inapplicable
 RMLTC0004a-SPARQL,inapplicable
 RMLTC0004a-SQLServer,inapplicable
-RMLTC0004a-XML,passing
-RMLTC0004b-CSV,passing
-RMLTC0004b-JSON,passing
+RMLTC0004a-XML,passed
+RMLTC0004b-CSV,passed
+RMLTC0004b-JSON,passed
 RMLTC0004b-MySQL,inapplicable
 RMLTC0004b-PostgreSQL,inapplicable
 RMLTC0004b-SPARQL,inapplicable
 RMLTC0004b-SQLServer,inapplicable
-RMLTC0004b-XML,passing
-RMLTC0005a-CSV,passing
-RMLTC0005a-JSON,passing
+RMLTC0004b-XML,passed
+RMLTC0005a-CSV,passed
+RMLTC0005a-JSON,passed
 RMLTC0005a-MySQL,inapplicable
 RMLTC0005a-PostgreSQL,inapplicable
 RMLTC0005a-SQLServer,inapplicable
-RMLTC0005a-XML,passing
+RMLTC0005a-XML,passed
 RMLTC0005b-MySQL,inapplicable
 RMLTC0005b-PostgreSQL,inapplicable
 RMLTC0005b-SQLServer,inapplicable
-RMLTC0006a-CSV,passing
-RMLTC0006a-JSON,passing
+RMLTC0006a-CSV,passed
+RMLTC0006a-JSON,passed
 RMLTC0006a-MySQL,inapplicable
 RMLTC0006a-PostgreSQL,inapplicable
 RMLTC0006a-SPARQL,inapplicable
 RMLTC0006a-SQLServer,inapplicable
-RMLTC0006a-XML,passing
-RMLTC0007a-CSV,passing
-RMLTC0007a-JSON,passing
+RMLTC0006a-XML,passed
+RMLTC0007a-CSV,passed
+RMLTC0007a-JSON,passed
 RMLTC0007a-MySQL,inapplicable
 RMLTC0007a-PostgreSQL,inapplicable
 RMLTC0007a-SPARQL,inapplicable
 RMLTC0007a-SQLServer,inapplicable
-RMLTC0007a-XML,passing
-RMLTC0007b-CSV,passing
-RMLTC0007b-JSON,passing
+RMLTC0007a-XML,passed
+RMLTC0007b-CSV,passed
+RMLTC0007b-JSON,passed
 RMLTC0007b-MySQL,inapplicable
 RMLTC0007b-PostgreSQL,inapplicable
 RMLTC0007b-SPARQL,inapplicable
 RMLTC0007b-SQLServer,inapplicable
-RMLTC0007b-XML,passing
-RMLTC0007c-CSV,passing
-RMLTC0007c-JSON,passing
+RMLTC0007b-XML,passed
+RMLTC0007c-CSV,passed
+RMLTC0007c-JSON,passed
 RMLTC0007c-MySQL,inapplicable
 RMLTC0007c-PostgreSQL,inapplicable
 RMLTC0007c-SPARQL,inapplicable
 RMLTC0007c-SQLServer,inapplicable
-RMLTC0007c-XML,passing
-RMLTC0007d-CSV,passing
-RMLTC0007d-JSON,passing
+RMLTC0007c-XML,passed
+RMLTC0007d-CSV,passed
+RMLTC0007d-JSON,passed
 RMLTC0007d-MySQL,inapplicable
 RMLTC0007d-PostgreSQL,inapplicable
 RMLTC0007d-SPARQL,inapplicable
 RMLTC0007d-SQLServer,inapplicable
-RMLTC0007d-XML,passing
-RMLTC0007e-CSV,passing
-RMLTC0007e-JSON,passing
+RMLTC0007d-XML,passed
+RMLTC0007e-CSV,passed
+RMLTC0007e-JSON,passed
 RMLTC0007e-MySQL,inapplicable
 RMLTC0007e-PostgreSQL,inapplicable
 RMLTC0007e-SPARQL,inapplicable
 RMLTC0007e-SQLServer,inapplicable
-RMLTC0007e-XML,passing
-RMLTC0007f-CSV,passing
-RMLTC0007f-JSON,passing
+RMLTC0007e-XML,passed
+RMLTC0007f-CSV,passed
+RMLTC0007f-JSON,passed
 RMLTC0007f-MySQL,inapplicable
 RMLTC0007f-PostgreSQL,inapplicable
 RMLTC0007f-SPARQL,inapplicable
 RMLTC0007f-SQLServer,inapplicable
-RMLTC0007f-XML,passing
-RMLTC0007g-CSV,passing
-RMLTC0007g-JSON,passing
+RMLTC0007f-XML,passed
+RMLTC0007g-CSV,passed
+RMLTC0007g-JSON,passed
 RMLTC0007g-MySQL,inapplicable
 RMLTC0007g-PostgreSQL,inapplicable
 RMLTC0007g-SPARQL,inapplicable
 RMLTC0007g-SQLServer,inapplicable
-RMLTC0007g-XML,passing
-RMLTC0007h-CSV,passing
-RMLTC0007h-JSON,passing
+RMLTC0007g-XML,passed
+RMLTC0007h-CSV,passed
+RMLTC0007h-JSON,passed
 RMLTC0007h-MySQL,inapplicable
 RMLTC0007h-PostgreSQL,inapplicable
 RMLTC0007h-SPARQL,inapplicable
 RMLTC0007h-SQLServer,inapplicable
-RMLTC0007h-XML,passing
-RMLTC0008a-CSV,passing
-RMLTC0008a-JSON,passing
+RMLTC0007h-XML,passed
+RMLTC0008a-CSV,passed
+RMLTC0008a-JSON,passed
 RMLTC0008a-MySQL,inapplicable
 RMLTC0008a-PostgreSQL,inapplicable
 RMLTC0008a-SPARQL,inapplicable
 RMLTC0008a-SQLServer,inapplicable
-RMLTC0008a-XML,passing
-RMLTC0008b-CSV,inapplicable
-RMLTC0008b-JSON,inapplicable
+RMLTC0008a-XML,passed
+RMLTC0008b-CSV,passed
+RMLTC0008b-JSON,passed
 RMLTC0008b-MySQL,inapplicable
 RMLTC0008b-PostgreSQL,inapplicable
 RMLTC0008b-SPARQL,inapplicable
 RMLTC0008b-SQLServer,inapplicable
-RMLTC0008b-XML,inapplicable
-RMLTC0008c-CSV,passing
-RMLTC0008c-JSON,passing
+RMLTC0008b-XML,passed
+RMLTC0008c-CSV,passed
+RMLTC0008c-JSON,passed
 RMLTC0008c-MySQL,inapplicable
 RMLTC0008c-PostgreSQL,inapplicable
 RMLTC0008c-SPARQL,inapplicable
 RMLTC0008c-SQLServer,inapplicable
-RMLTC0008c-XML,passing
-RMLTC0009a-CSV,inapplicable
-RMLTC0009a-JSON,inapplicable
+RMLTC0008c-XML,passed
+RMLTC0009a-CSV,passed
+RMLTC0009a-JSON,passed
 RMLTC0009a-MySQL,inapplicable
 RMLTC0009a-PostgreSQL,inapplicable
 RMLTC0009a-SPARQL,inapplicable
 RMLTC0009a-SQLServer,inapplicable
-RMLTC0009a-XML,inapplicable
-RMLTC0009b-CSV,inapplicable
-RMLTC0009b-JSON,inapplicable
+RMLTC0009a-XML,passed
+RMLTC0009b-CSV,passed
+RMLTC0009b-JSON,passed
 RMLTC0009b-MySQL,inapplicable
 RMLTC0009b-PostgreSQL,inapplicable
 RMLTC0009b-SPARQL,inapplicable
 RMLTC0009b-SQLServer,inapplicable
-RMLTC0009b-XML,inapplicable
+RMLTC0009b-XML,passed
 RMLTC0009c-MySQL,inapplicable
 RMLTC0009c-PostgreSQL,inapplicable
 RMLTC0009c-SQLServer,inapplicable
 RMLTC0009d-MySQL,inapplicable
 RMLTC0009d-PostgreSQL,inapplicable
 RMLTC0009d-SQLServer,inapplicable
-RMLTC0010a-CSV,passing
-RMLTC0010a-JSON,passing
+RMLTC0010a-CSV,passed
+RMLTC0010a-JSON,passed
 RMLTC0010a-MySQL,inapplicable
 RMLTC0010a-PostgreSQL,inapplicable
 RMLTC0010a-SQLServer,inapplicable
-RMLTC0010b-CSV,passing
-RMLTC0010b-JSON,passing
+RMLTC0010b-CSV,passed
+RMLTC0010b-JSON,passed
 RMLTC0010b-MySQL,inapplicable
 RMLTC0010b-PostgreSQL,inapplicable
 RMLTC0010b-SQLServer,inapplicable
-RMLTC0010b-XML,passing
-RMLTC0010c-CSV,inapplicable
-RMLTC0010c-JSON,inapplicable
+RMLTC0010b-XML,passed
+RMLTC0010c-CSV,passed
+RMLTC0010c-JSON,passed
 RMLTC0010c-MySQL,inapplicable
 RMLTC0010c-PostgreSQL,inapplicable
 RMLTC0010c-SQLServer,inapplicable
-RMLTC0010c-XML,inapplicable
+RMLTC0010c-XML,passed
 RMLTC0011a-MySQL,inapplicable
 RMLTC0011a-PostgreSQL,inapplicable
 RMLTC0011a-SQLServer,inapplicable
-RMLTC0011b-CSV,passing
-RMLTC0011b-JSON,passing
+RMLTC0011b-CSV,passed
+RMLTC0011b-JSON,passed
 RMLTC0011b-MySQL,inapplicable
 RMLTC0011b-PostgreSQL,inapplicable
 RMLTC0011b-SQLServer,inapplicable
-RMLTC0011b-XML,passing
-RMLTC0012a-CSV,passing
-RMLTC0012a-JSON,passing
+RMLTC0011b-XML,passed
+RMLTC0012a-CSV,passed
+RMLTC0012a-JSON,passed
 RMLTC0012a-MySQL,inapplicable
 RMLTC0012a-PostgreSQL,inapplicable
 RMLTC0012a-SPARQL,inapplicable
 RMLTC0012a-SQLServer,inapplicable
-RMLTC0012a-XML,passing
-RMLTC0012b-CSV,passing
-RMLTC0012b-JSON,passing
+RMLTC0012a-XML,passed
+RMLTC0012b-CSV,passed
+RMLTC0012b-JSON,passed
 RMLTC0012b-MySQL,inapplicable
 RMLTC0012b-PostgreSQL,inapplicable
 RMLTC0012b-SPARQL,inapplicable
 RMLTC0012b-SQLServer,inapplicable
-RMLTC0012b-XML,passing
-RMLTC0012c-CSV,passing
-RMLTC0012c-JSON,passing
+RMLTC0012b-XML,passed
+RMLTC0012c-CSV,passed
+RMLTC0012c-JSON,passed
 RMLTC0012c-MySQL,inapplicable
 RMLTC0012c-PostgreSQL,inapplicable
 RMLTC0012c-SQLServer,inapplicable
-RMLTC0012c-XML,passing
-RMLTC0012d-CSV,passing
-RMLTC0012d-JSON,passing
+RMLTC0012c-XML,passed
+RMLTC0012d-CSV,passed
+RMLTC0012d-JSON,passed
 RMLTC0012d-MySQL,inapplicable
 RMLTC0012d-PostgreSQL,inapplicable
 RMLTC0012d-SQLServer,inapplicable
-RMLTC0012d-XML,passing
+RMLTC0012d-XML,passed
 RMLTC0012e-MySQL,inapplicable
 RMLTC0012e-PostgreSQL,inapplicable
 RMLTC0012e-SQLServer,inapplicable
-RMLTC0013a-JSON,passing
+RMLTC0013a-JSON,passed
 RMLTC0013a-MySQL,inapplicable
 RMLTC0013a-PostgreSQL,inapplicable
 RMLTC0013a-SQLServer,inapplicable
 RMLTC0014d-MySQL,inapplicable
 RMLTC0014d-PostgreSQL,inapplicable
 RMLTC0014d-SQLServer,inapplicable
-RMLTC0015a-CSV,passing
-RMLTC0015a-JSON,passing
+RMLTC0015a-CSV,passed
+RMLTC0015a-JSON,passed
 RMLTC0015a-MySQL,inapplicable
 RMLTC0015a-PostgreSQL,inapplicable
 RMLTC0015a-SQLServer,inapplicable
-RMLTC0015a-XML,passing
-RMLTC0015b-CSV,passing
-RMLTC0015b-JSON,passing
+RMLTC0015a-XML,passed
+RMLTC0015b-CSV,passed
+RMLTC0015b-JSON,passed
 RMLTC0015b-MySQL,inapplicable
 RMLTC0015b-PostgreSQL,inapplicable
 RMLTC0015b-SQLServer,inapplicable
-RMLTC0015b-XML,passing
+RMLTC0015b-XML,passed
 RMLTC0016a-MySQL,inapplicable
 RMLTC0016a-PostgreSQL,inapplicable
 RMLTC0016a-SQLServer,inapplicable
@@ -299,27 +299,27 @@ RMLTC0016e-SQLServer,inapplicable
 RMLTC0018a-MySQL,inapplicable
 RMLTC0018a-PostgreSQL,inapplicable
 RMLTC0018a-SQLServer,inapplicable
-RMLTC0019a-CSV,passing
-RMLTC0019a-JSON,passing
+RMLTC0019a-CSV,passed
+RMLTC0019a-JSON,passed
 RMLTC0019a-MySQL,inapplicable
 RMLTC0019a-PostgreSQL,inapplicable
 RMLTC0019a-SQLServer,inapplicable
-RMLTC0019a-XML,passing
-RMLTC0019b-CSV,passing
-RMLTC0019b-JSON,passing
+RMLTC0019a-XML,passed
+RMLTC0019b-CSV,passed
+RMLTC0019b-JSON,passed
 RMLTC0019b-MySQL,inapplicable
 RMLTC0019b-PostgreSQL,inapplicable
 RMLTC0019b-SQLServer,inapplicable
-RMLTC0019b-XML,passing
-RMLTC0020a-CSV,passing
-RMLTC0020a-JSON,passing
+RMLTC0019b-XML,passed
+RMLTC0020a-CSV,passed
+RMLTC0020a-JSON,passed
 RMLTC0020a-MySQL,inapplicable
 RMLTC0020a-PostgreSQL,inapplicable
 RMLTC0020a-SQLServer,inapplicable
-RMLTC0020a-XML,passing
-RMLTC0020b-CSV,passing
-RMLTC0020b-JSON,passing
+RMLTC0020a-XML,passed
+RMLTC0020b-CSV,passed
+RMLTC0020b-JSON,passed
 RMLTC0020b-MySQL,inapplicable
 RMLTC0020b-PostgreSQL,inapplicable
 RMLTC0020b-SQLServer,inapplicable
-RMLTC0020b-XML,passing
+RMLTC0020b-XML,passed
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-CSV/mapping.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/mapping.ttl
similarity index 90%
rename from src/test/resources/negative_test_cases/RMLTC0004b-CSV/mapping.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/mapping.ttl
index af1f39a6..bbf9d957 100644
--- a/src/test/resources/negative_test_cases/RMLTC0004b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0004b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-CSV/output.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0004b-CSV/output.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/output.ttl
diff --git a/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/student.csv b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/student.csv
new file mode 100644
index 00000000..4e683bbe
--- /dev/null
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-CSV/student.csv
@@ -0,0 +1,2 @@
+Name
+Venus
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-JSON/mapping.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/mapping.ttl
similarity index 90%
rename from src/test/resources/negative_test_cases/RMLTC0004b-JSON/mapping.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/mapping.ttl
index dc592ce2..a0b87505 100644
--- a/src/test/resources/negative_test_cases/RMLTC0004b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0004b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-JSON/output.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0004b-JSON/output.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/output.ttl
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-JSON/student.json b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/student.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0004b-JSON/student.json
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-JSON/student.json
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-XML/mapping.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/mapping.ttl
similarity index 91%
rename from src/test/resources/negative_test_cases/RMLTC0004b-XML/mapping.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/mapping.ttl
index fda50028..1c9301df 100644
--- a/src/test/resources/negative_test_cases/RMLTC0004b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0004b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-XML/output.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0004b-XML/output.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/output.ttl
diff --git a/src/test/resources/negative_test_cases/RMLTC0004b-XML/student.xml b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/student.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0004b-XML/student.xml
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0004b-XML/student.xml
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-CSV/mapping.rml.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-CSV/mapping.rml.ttl
similarity index 91%
rename from src/test/resources/negative_test_cases/RMLTC0012c-CSV/mapping.rml.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-CSV/mapping.rml.ttl
index ffee4af0..5147b0f1 100644
--- a/src/test/resources/negative_test_cases/RMLTC0012c-CSV/mapping.rml.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-CSV/mapping.rml.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012c-CSV/persons.csv";
+    rml:source "persons.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-CSV/persons.csv b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-CSV/persons.csv
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0012c-CSV/persons.csv
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-CSV/persons.csv
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-JSON/mapping.rml.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-JSON/mapping.rml.ttl
similarity index 91%
rename from src/test/resources/negative_test_cases/RMLTC0012c-JSON/mapping.rml.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-JSON/mapping.rml.ttl
index 5f85446f..3a84fbae 100644
--- a/src/test/resources/negative_test_cases/RMLTC0012c-JSON/mapping.rml.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-JSON/mapping.rml.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012c-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-JSON/persons.json b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-JSON/persons.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0012c-JSON/persons.json
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-JSON/persons.json
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-XML/mapping.rml.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-XML/mapping.rml.ttl
similarity index 91%
rename from src/test/resources/negative_test_cases/RMLTC0012c-XML/mapping.rml.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-XML/mapping.rml.ttl
index cc3ec3b8..79733745 100644
--- a/src/test/resources/negative_test_cases/RMLTC0012c-XML/mapping.rml.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-XML/mapping.rml.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012c-XML/persons.xml";
+    rml:source "persons.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Persons/Person"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0012c-XML/persons.xml b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-XML/persons.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0012c-XML/persons.xml
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012c-XML/persons.xml
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-CSV/mapping.rml.ttl.bak b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-CSV/mapping.rml.ttl
similarity index 93%
rename from src/test/resources/negative_test_cases/RMLTC0012d-CSV/mapping.rml.ttl.bak
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-CSV/mapping.rml.ttl
index 8f465fbe..6499b34f 100644
--- a/src/test/resources/negative_test_cases/RMLTC0012d-CSV/mapping.rml.ttl.bak
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-CSV/mapping.rml.ttl
@@ -11,10 +11,11 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012d-CSV/persons.csv";
+    rml:source "persons.csv";
     rml:referenceFormulation ql:CSV
   ];
 	
+
   rr:subjectMap [ rr:template "{fname}_{lname}_{amount}"; rr:termType rr:BlankNode; ];
 
   rr:subjectMap [ rr:template "{amount}_{fname}_{lname}"; rr:termType rr:BlankNode; ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-CSV/persons.csv b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-CSV/persons.csv
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0012d-CSV/persons.csv
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-CSV/persons.csv
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-JSON/mapping.rml.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-JSON/mapping.rml.ttl
similarity index 93%
rename from src/test/resources/negative_test_cases/RMLTC0012d-JSON/mapping.rml.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-JSON/mapping.rml.ttl
index 5a34c70a..51958c84 100644
--- a/src/test/resources/negative_test_cases/RMLTC0012d-JSON/mapping.rml.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-JSON/mapping.rml.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012d-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-JSON/persons.json b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-JSON/persons.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0012d-JSON/persons.json
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-JSON/persons.json
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-XML/mapping.rml.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-XML/mapping.rml.ttl
similarity index 93%
rename from src/test/resources/negative_test_cases/RMLTC0012d-XML/mapping.rml.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-XML/mapping.rml.ttl
index dd84f533..5a0afd86 100644
--- a/src/test/resources/negative_test_cases/RMLTC0012d-XML/mapping.rml.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-XML/mapping.rml.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0012d-XML/persons.xml";
+    rml:source "persons.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Persons/Person"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0012d-XML/persons.xml b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-XML/persons.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0012d-XML/persons.xml
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0012d-XML/persons.xml
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-CSV/country_en.csv b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/country_en.csv
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0015b-CSV/country_en.csv
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/country_en.csv
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-CSV/country_es.csv b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/country_es.csv
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0015b-CSV/country_es.csv
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/country_es.csv
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-CSV/mapping.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/mapping.ttl
similarity index 87%
rename from src/test/resources/negative_test_cases/RMLTC0015b-CSV/mapping.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/mapping.ttl
index b53c1739..417a388c 100644
--- a/src/test/resources/negative_test_cases/RMLTC0015b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-CSV/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0015b-CSV/country_en.csv";
+    rml:source "country_en.csv";
     rml:referenceFormulation ql:CSV
   ];
 
@@ -30,7 +30,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0015b-CSV/country_es.csv";
+    rml:source "country_es.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-JSON/country_en.json b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/country_en.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0015b-JSON/country_en.json
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/country_en.json
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-JSON/country_es.json b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/country_es.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0015b-JSON/country_es.json
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/country_es.json
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-JSON/mapping.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/mapping.ttl
similarity index 88%
rename from src/test/resources/negative_test_cases/RMLTC0015b-JSON/mapping.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/mapping.ttl
index edd8662b..3279f3e8 100644
--- a/src/test/resources/negative_test_cases/RMLTC0015b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-JSON/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0015b-JSON/country_en.json";
+    rml:source "country_en.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
@@ -31,7 +31,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0015b-JSON/country_en.json";
+    rml:source "country_en.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-XML/country_en.xml b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/country_en.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0015b-XML/country_en.xml
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/country_en.xml
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-XML/country_es.xml b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/country_es.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0015b-XML/country_es.xml
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/country_es.xml
diff --git a/src/test/resources/negative_test_cases/RMLTC0015b-XML/mapping.ttl b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/mapping.ttl
similarity index 88%
rename from src/test/resources/negative_test_cases/RMLTC0015b-XML/mapping.ttl
rename to src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/mapping.ttl
index dc057655..c1bf7a64 100644
--- a/src/test/resources/negative_test_cases/RMLTC0015b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases-invalid-mapping-file/RMLTC0015b-XML/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0015b-XML/country_en.xml";
+    rml:source "country_en.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
@@ -31,7 +31,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "negative_test_cases/RMLTC0015b-XML/country_es.xml";
+    rml:source "country_es.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/mapping.ttl
similarity index 90%
rename from src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl.bak
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/mapping.ttl
index 01e6a608..b189d5c1 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl.bak
+++ b/src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002c-CSV/student.csv";
+    rml:source "student2.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-XML/output.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/output.ttl
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002g-XML/output.ttl
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/output.ttl
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-CSV/student.csv b/src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/student.csv
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002e-CSV/student.csv
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-CSV/student.csv
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/mapping.ttl
similarity index 91%
rename from src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl.bak
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/mapping.ttl
index 54cf185e..1c156053 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl.bak
+++ b/src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002c-JSON/student.json";
+    rml:source "student2.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/output.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-JSON/student.json b/src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/student.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002e-JSON/student.json
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-JSON/student.json
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl.bak b/src/test/resources/rml-testcases-negative/RMLTC0002e-XML/mapping.ttl
similarity index 91%
rename from src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl.bak
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-XML/mapping.ttl
index 1df25bae..abfdd229 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl.bak
+++ b/src/test/resources/rml-testcases-negative/RMLTC0002e-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002c-XML/student.xml";
+    rml:source "student2.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases-negative/RMLTC0002e-XML/output.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002e-XML/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/negative_test_cases/RMLTC0002e-XML/student.xml b/src/test/resources/rml-testcases-negative/RMLTC0002e-XML/student.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002e-XML/student.xml
rename to src/test/resources/rml-testcases-negative/RMLTC0002e-XML/student.xml
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-JSON/mapping.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/mapping.ttl
similarity index 90%
rename from src/test/resources/negative_test_cases/RMLTC0002g-JSON/mapping.ttl
rename to src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/mapping.ttl
index 4dbf04b8..d561e70c 100644
--- a/src/test/resources/negative_test_cases/RMLTC0002g-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002g-JSON/student2.json";
+    rml:source "student2.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]]"
   ];
diff --git a/src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/output.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-JSON/student.json b/src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/student.json
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002g-JSON/student.json
rename to src/test/resources/rml-testcases-negative/RMLTC0002g-JSON/student.json
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-XML/mapping.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002g-XML/mapping.ttl
similarity index 90%
rename from src/test/resources/negative_test_cases/RMLTC0002g-XML/mapping.ttl
rename to src/test/resources/rml-testcases-negative/RMLTC0002g-XML/mapping.ttl
index ee58a19f..548d5d59 100644
--- a/src/test/resources/negative_test_cases/RMLTC0002g-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases-negative/RMLTC0002g-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "negative_test_cases/RMLTC0002g-XML/student2.xml";
+    rml:source "student2.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "$"
   ];
diff --git a/src/test/resources/rml-testcases-negative/RMLTC0002g-XML/output.ttl b/src/test/resources/rml-testcases-negative/RMLTC0002g-XML/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/negative_test_cases/RMLTC0002g-XML/student.xml b/src/test/resources/rml-testcases-negative/RMLTC0002g-XML/student.xml
similarity index 100%
rename from src/test/resources/negative_test_cases/RMLTC0002g-XML/student.xml
rename to src/test/resources/rml-testcases-negative/RMLTC0002g-XML/student.xml
diff --git a/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl
index 33da1736..ad67a5f4 100644
--- a/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
         
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0000-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ] ;
 	
diff --git a/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl.bak
deleted file mode 100644
index 33da1736..00000000
--- a/src/test/resources/rml-testcases/RMLTC0000-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-        
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0000-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ] ;
-	
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Name}" 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rml:reference "Name" 
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl
index b36ad519..2c58780c 100644
--- a/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
         
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0000-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ] ;
diff --git a/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl.bak
deleted file mode 100644
index b36ad519..00000000
--- a/src/test/resources/rml-testcases/RMLTC0000-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-        
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0000-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ] ;
-	
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Name}" 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rml:reference "Name" 
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl
index 7220092b..d9278416 100644
--- a/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
         
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0000-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ] ;
diff --git a/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl.bak
deleted file mode 100644
index 7220092b..00000000
--- a/src/test/resources/rml-testcases/RMLTC0000-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-        
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0000-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ] ;
-	
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Name}" 
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rml:reference "Name" 
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl
index 251574db..330858ba 100644
--- a/src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0001a-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0001a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl
index 2f62685a..5c950c64 100644
--- a/src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0001a-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0001a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0001a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0001a-XML/mapping.ttl
index a765b8d8..937f71fc 100644
--- a/src/test/resources/rml-testcases/RMLTC0001a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0001a-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0001a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl
index 9cc33471..33133e60 100644
--- a/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl
@@ -10,7 +10,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0001b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl.bak
deleted file mode 100644
index 9cc33471..00000000
--- a/src/test/resources/rml-testcases/RMLTC0001b-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0001b-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [
-    rr:template "{Name}";
-    rr:termType rr:BlankNode
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl
index 516e6b36..55cb59c9 100644
--- a/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl
@@ -10,7 +10,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0001b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl.bak
deleted file mode 100644
index 516e6b36..00000000
--- a/src/test/resources/rml-testcases/RMLTC0001b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,29 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0001b-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [
-    rr:template "{Name}";
-    rr:termType rr:BlankNode
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl
index e79f0c20..97418149 100644
--- a/src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0001b-XML/mapping.ttl
@@ -10,7 +10,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0001b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl
index 7e569f17..c21aa51f 100644
--- a/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl.bak
deleted file mode 100644
index 7e569f17..00000000
--- a/src/test/resources/rml-testcases/RMLTC0002a-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,29 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002a-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}";
-    rr:class foaf:Person 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "ID" ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ rml:reference "Name" ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl
index d5406e67..31f8da3f 100644
--- a/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl.bak
deleted file mode 100644
index d5406e67..00000000
--- a/src/test/resources/rml-testcases/RMLTC0002a-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,30 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002a-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}";
-    rr:class foaf:Person 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "ID" ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ rml:reference "Name" ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl
index e773d068..1db40ec7 100644
--- a/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl.bak
deleted file mode 100644
index e773d068..00000000
--- a/src/test/resources/rml-testcases/RMLTC0002a-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,30 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002a-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}";
-    rr:class foaf:Person 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "ID" ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ rml:reference "Name" ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl
index 937c9bef..e8181fde 100644
--- a/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0002b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl.bak
deleted file mode 100644
index 937c9bef..00000000
--- a/src/test/resources/rml-testcases/RMLTC0002b-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0002b-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "students{ID}";
-    rr:termType rr:BlankNode
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [ rml:reference "Name" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl
index 7353cc34..bd512278 100644
--- a/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0002b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl.bak
deleted file mode 100644
index 7353cc34..00000000
--- a/src/test/resources/rml-testcases/RMLTC0002b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0002b-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "students{ID}";
-    rr:termType rr:BlankNode
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [ rml:reference "Name" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl
index ef23759b..9ef0c3c0 100644
--- a/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0002b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl.bak
deleted file mode 100644
index ef23759b..00000000
--- a/src/test/resources/rml-testcases/RMLTC0002b-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0002b-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "students{ID}";
-    rr:termType rr:BlankNode
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [ rml:reference "Name" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl
index 01e6a608..144f3850 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002c-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl
index 54cf185e..921cd4c6 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002c-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002c-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl
index 1df25bae..e0dda06e 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0002c-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0002c-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl
index 0108342a..764573ee 100644
--- a/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0003c-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl.bak
deleted file mode 100644
index 0108342a..00000000
--- a/src/test/resources/rml-testcases/RMLTC0003c-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0003c-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student{ID}";
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rr:template "{FirstName} {LastName}"; 
-      rr:termType rr:Literal; 
-    ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl
index d96358b6..36727fd0 100644
--- a/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0003c-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl.bak
deleted file mode 100644
index d96358b6..00000000
--- a/src/test/resources/rml-testcases/RMLTC0003c-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0003c-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student{ID}";
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rr:template "{FirstName} {LastName}"; 
-      rr:termType rr:Literal; 
-    ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl
index f3bb3b0b..0201038f 100644
--- a/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0003c-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl.bak
deleted file mode 100644
index f3bb3b0b..00000000
--- a/src/test/resources/rml-testcases/RMLTC0003c-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0003c-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student{ID}";
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name; 
-    rr:objectMap [ 
-      rr:template "{FirstName} {LastName}"; 
-      rr:termType rr:Literal; 
-    ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0004a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0004a-CSV/mapping.ttl
index c5b12075..1d26bf00 100644
--- a/src/test/resources/rml-testcases/RMLTC0004a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0004a-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-CSV/student_sport.csv";
+    rml:source "student_sport.csv";
     rml:referenceFormulation ql:CSV
   ];
 
@@ -28,7 +28,7 @@
 <TriplesMap2> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-CSV/student_sport.csv";
+    rml:source "student_sport.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl
index e36b6e3d..56dbc7d8 100644
--- a/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-JSON/student_sport.json";
+    rml:source "student_sport.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
@@ -29,7 +29,7 @@
 <TriplesMap2> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-JSON/student_sport.json";
+    rml:source "student_sport.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl.bak
deleted file mode 100644
index e36b6e3d..00000000
--- a/src/test/resources/rml-testcases/RMLTC0004a-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,47 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-JSON/student_sport.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Student}";
-    rr:class ex:Student
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rml:reference "Student"
-    ]
-  ].
-
-<TriplesMap2> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-JSON/student_sport.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/{Sport}";
-    rr:class ex:Sport
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [ 
-      rml:reference "Sport"
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0004a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0004a-XML/mapping.ttl
index a88d547e..96553a92 100644
--- a/src/test/resources/rml-testcases/RMLTC0004a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0004a-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-XML/student_sport.xml";
+    rml:source "student_sport.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
@@ -29,7 +29,7 @@
 <TriplesMap2> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0004a-XML/student_sport.xml";
+    rml:source "student_sport.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0005a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0005a-CSV/mapping.ttl
index f4b223f7..8474bfbb 100644
--- a/src/test/resources/rml-testcases/RMLTC0005a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0005a-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0005a-CSV/ious.csv";
+    rml:source "ious.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0005a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0005a-JSON/mapping.ttl
index 758a8f26..afa6f260 100644
--- a/src/test/resources/rml-testcases/RMLTC0005a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0005a-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0005a-JSON/ious.json";
+    rml:source "ious.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0005a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0005a-XML/mapping.ttl
index 5e500039..1d9c4083 100644
--- a/src/test/resources/rml-testcases/RMLTC0005a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0005a-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0005a-XML/ious.xml";
+    rml:source "ious.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/persons/person"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0006a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0006a-CSV/mapping.ttl
index 455befc8..7e6be247 100644
--- a/src/test/resources/rml-testcases/RMLTC0006a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0006a-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0006a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0006a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0006a-JSON/mapping.ttl
index 303da93b..9a95665a 100644
--- a/src/test/resources/rml-testcases/RMLTC0006a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0006a-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0006a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0006a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0006a-XML/mapping.ttl
index fa217e49..f89ee47d 100644
--- a/src/test/resources/rml-testcases/RMLTC0006a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0006a-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0006a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007a-CSV/mapping.ttl
index ab7b8cd6..9845b799 100644
--- a/src/test/resources/rml-testcases/RMLTC0007a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007a-CSV/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl
index 203cbee6..a64e94e8 100644
--- a/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl.bak
deleted file mode 100644
index e257e69d..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007a-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007a-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}"
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object foaf:Person; 
-  ].
-
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007a-XML/mapping.ttl
index 944aa0ca..64163067 100644
--- a/src/test/resources/rml-testcases/RMLTC0007a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007a-XML/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007b-CSV/mapping.ttl
index 2e499f1c..04eaba04 100644
--- a/src/test/resources/rml-testcases/RMLTC0007b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007b-CSV/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0007b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007b-JSON/mapping.ttl
index 7c0f9306..9c327a13 100644
--- a/src/test/resources/rml-testcases/RMLTC0007b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007b-JSON/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0007b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007b-XML/mapping.ttl
index 033c2164..7d7cd660 100644
--- a/src/test/resources/rml-testcases/RMLTC0007b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007b-XML/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl
index 5040ba47..1ba21210 100644
--- a/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007c-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl.bak
deleted file mode 100644
index 5040ba47..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007c-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007c-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:class foaf:Person, ex:Student
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [ rml:reference "FirstName" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl
index 75d09ad2..14b2b998 100644
--- a/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007c-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl.bak
deleted file mode 100644
index 75d09ad2..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007c-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007c-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:class foaf:Person, ex:Student
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [ rml:reference "FirstName" ]
-  ].
-
-
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl
index 88bab61b..dd326a68 100644
--- a/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007c-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl.bak
deleted file mode 100644
index 88bab61b..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007c-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007c-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:class foaf:Person, ex:Student
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [ rml:reference "FirstName" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl
index 953fd3e4..faa83b7d 100644
--- a/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007d-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl.bak
deleted file mode 100644
index 953fd3e4..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007d-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,35 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007d-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}"
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object foaf:Person; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object ex:Student; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [ rml:reference "FirstName" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl
index 064ed5ab..7738c623 100644
--- a/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007d-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl.bak
deleted file mode 100644
index 93adffe1..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007d-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,37 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007d-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}"
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object foaf:Person; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object ex:Student; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [ rml:reference "FirstName" ]
-  ].
-
-
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl
index d6299195..06156b45 100644
--- a/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007d-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl.bak
deleted file mode 100644
index d6299195..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007d-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,37 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007d-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}"
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object foaf:Person; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type;
-    rr:object ex:Student; 
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [ rml:reference "FirstName" ]
-  ].
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007e-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007e-CSV/mapping.ttl
index e6c72c49..d234713e 100644
--- a/src/test/resources/rml-testcases/RMLTC0007e-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007e-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007e-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007e-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007e-JSON/mapping.ttl
index 708cd38b..e1c0b6e7 100644
--- a/src/test/resources/rml-testcases/RMLTC0007e-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007e-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007e-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007e-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007e-XML/mapping.ttl
index 03f581ee..2b10803a 100644
--- a/src/test/resources/rml-testcases/RMLTC0007e-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007e-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007e-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007f-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007f-CSV/mapping.ttl
index ce9a4b1d..eebc0bbf 100644
--- a/src/test/resources/rml-testcases/RMLTC0007f-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007f-CSV/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007f-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007f-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007f-JSON/mapping.ttl
index 19ca129b..f3d786a1 100644
--- a/src/test/resources/rml-testcases/RMLTC0007f-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007f-JSON/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007f-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007f-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007f-XML/mapping.ttl
index f6055b97..690f779d 100644
--- a/src/test/resources/rml-testcases/RMLTC0007f-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007f-XML/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0007f-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl
index 012ab7d7..96e9ec1c 100644
--- a/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007g-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl.bak
deleted file mode 100644
index 012ab7d7..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007g-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007g-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:graph rr:defaultGraph
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [
-      rml:reference "FirstName"
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl
index 9d513cf4..64ab7461 100644
--- a/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007g-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl.bak
deleted file mode 100644
index 9d513cf4..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007g-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,30 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007g-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:graph rr:defaultGraph
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [
-      rml:reference "FirstName"
-    ]
-  ].
-
-
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl
index 759cdd24..10d22c01 100644
--- a/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007g-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl.bak
deleted file mode 100644
index 759cdd24..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007g-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007g-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:graph rr:defaultGraph
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [
-      rml:reference "FirstName"
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl
index 165e84af..b1727bf0 100644
--- a/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007h-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl.bak
deleted file mode 100644
index 165e84af..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007h-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007h-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:graph [ rml:reference "Name"; rr:termType rr:Literal; ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl
index a1e0d1da..de6d4799 100644
--- a/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007h-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl.bak
deleted file mode 100644
index a1e0d1da..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007h-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,30 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007h-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:graph [ rml:reference "Name"; rr:termType rr:Literal; ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
-
-
-
diff --git a/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl
index 1bf378c5..be342627 100644
--- a/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl
@@ -9,7 +9,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007h-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl.bak
deleted file mode 100644
index 1bf378c5..00000000
--- a/src/test/resources/rml-testcases/RMLTC0007h-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1> a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0007h-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}/{FirstName}";
-    rr:graph [ rml:reference "Name"; rr:termType rr:Literal; ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name;
-    rr:objectMap [
-      rml:reference "Name"
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0008a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008a-CSV/mapping.ttl
index 48e4dd8b..18ff6c45 100644
--- a/src/test/resources/rml-testcases/RMLTC0008a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008a-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0008a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0008a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008a-JSON/mapping.ttl
index 2a948d96..cd63e51f 100644
--- a/src/test/resources/rml-testcases/RMLTC0008a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008a-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0008a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008a-XML/mapping.ttl
index 6baa5a98..7f729ea7 100644
--- a/src/test/resources/rml-testcases/RMLTC0008a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008a-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl
index b2cee72b..0dcf7ff3 100644
--- a/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap2>
   a rr:TriplesMap;
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
@@ -27,7 +27,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl.bak
deleted file mode 100644
index b2cee72b..00000000
--- a/src/test/resources/rml-testcases/RMLTC0008b-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,60 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Sport}" ];
-
-  rr:predicateObjectMap [
-    rr:predicate rdf:type ;
-    rr:object activity:Sport ;
-  ] .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type ;
-    rr:object foaf:Person ;
-  ];
-		
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ;
-    rr:objectMap [ rml:reference "ID"; ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ];
- 
-  rr:predicateObjectMap [ 
-    rr:predicate ex:Sport ;
-    rr:objectMap <RefObjectMap1>
-  ] .
-
- 
-<RefObjectMap1>
-  a rr:RefObjectMap;
-  rr:parentTriplesMap <TriplesMap2> .
-
diff --git a/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl
index 68daa599..bcb7c792 100644
--- a/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap2>
   a rr:TriplesMap;
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
@@ -28,7 +28,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl.bak
deleted file mode 100644
index 68daa599..00000000
--- a/src/test/resources/rml-testcases/RMLTC0008b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,62 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Sport}" ];
-
-  rr:predicateObjectMap [
-    rr:predicate rdf:type ;
-    rr:object activity:Sport ;
-  ] .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type ;
-    rr:object foaf:Person ;
-  ];
-		
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ;
-    rr:objectMap [ rml:reference "ID"; ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ];
- 
-  rr:predicateObjectMap [ 
-    rr:predicate ex:Sport ;
-    rr:objectMap <RefObjectMap1>
-  ] .
-
- 
-<RefObjectMap1>
-  a rr:RefObjectMap;
-  rr:parentTriplesMap <TriplesMap2> .
-
diff --git a/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl
index 0ffff561..6e0d62e1 100644
--- a/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap2>
   a rr:TriplesMap;
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
@@ -28,7 +28,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl.bak
deleted file mode 100644
index 0ffff561..00000000
--- a/src/test/resources/rml-testcases/RMLTC0008b-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,61 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Sport}" ];
-
-  rr:predicateObjectMap [
-    rr:predicate rdf:type ;
-    rr:object activity:Sport ;
-  ] .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008b-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate rdf:type ;
-    rr:object foaf:Person ;
-  ];
-		
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id ;
-    rr:objectMap [ rml:reference "ID"; ]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ];
- 
-  rr:predicateObjectMap [ 
-    rr:predicate ex:Sport ;
-    rr:objectMap <RefObjectMap1>
-  ] .
-
- 
-<RefObjectMap1>
-  a rr:RefObjectMap;
-  rr:parentTriplesMap <TriplesMap2> .
diff --git a/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl
index 11ebc207..43dc9a5b 100644
--- a/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008c-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl.bak
deleted file mode 100644
index 11ebc207..00000000
--- a/src/test/resources/rml-testcases/RMLTC0008c-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008c-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl
index 9b9274c1..b642a14b 100644
--- a/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008c-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl.bak
deleted file mode 100644
index 9b9274c1..00000000
--- a/src/test/resources/rml-testcases/RMLTC0008c-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008c-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl
index 51ad3ddd..1971d275 100644
--- a/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008c-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl.bak
deleted file mode 100644
index 51ad3ddd..00000000
--- a/src/test/resources/rml-testcases/RMLTC0008c-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0008c-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl
index 2d394ede..2d38c327 100644
--- a/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
@@ -40,7 +40,7 @@
   a rr:TriplesMap;
 		
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-CSV/sport.csv";
+    rml:source "sport.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl.bak
deleted file mode 100644
index 2d394ede..00000000
--- a/src/test/resources/rml-testcases/RMLTC0009a-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,52 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-CSV/student.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/resource/student_{ID}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] ;
-
-  rr:predicateObjectMap [ 
-    rr:predicate <http://example.com/ontology/practises> ;
-    rr:objectMap [ 
-      a rr:RefObjectMap ;
-      rr:parentTriplesMap <TriplesMap2>;
-      rr:joinCondition [
-        rr:child "Sport" ;
-        rr:parent "ID" ;
-      ]
-    ]
-  ] .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-		
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-CSV/sport.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/resource/sport_{ID}" ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate rdfs:label ; 
-    rr:objectMap [ rml:reference "Name" ];
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl
index e0b45c01..247540c4 100644
--- a/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
@@ -41,7 +41,7 @@
   a rr:TriplesMap;
 		
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-JSON/sport.json";
+    rml:source "sport.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.sports[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl.bak
deleted file mode 100644
index e0b45c01..00000000
--- a/src/test/resources/rml-testcases/RMLTC0009a-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/resource/student_{ID}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] ;
-
-  rr:predicateObjectMap [ 
-    rr:predicate <http://example.com/ontology/practises> ;
-    rr:objectMap [ 
-      a rr:RefObjectMap ;
-      rr:parentTriplesMap <TriplesMap2>;
-      rr:joinCondition [
-        rr:child "Sport" ;
-        rr:parent "ID" ;
-      ]
-    ]
-  ] .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-		
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-JSON/sport.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.sports[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/resource/sport_{ID}" ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate rdfs:label ; 
-    rr:objectMap [ rml:reference "Name" ];
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl
index 041eae6e..e231a415 100644
--- a/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
@@ -41,7 +41,7 @@
   a rr:TriplesMap;
 		
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-XML/sport.xml";
+    rml:source "sport.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/sports/sport"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl.bak
deleted file mode 100644
index 041eae6e..00000000
--- a/src/test/resources/rml-testcases/RMLTC0009a-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/resource/student_{ID}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] ;
-
-  rr:predicateObjectMap [ 
-    rr:predicate <http://example.com/ontology/practises> ;
-    rr:objectMap [ 
-      a rr:RefObjectMap ;
-      rr:parentTriplesMap <TriplesMap2>;
-      rr:joinCondition [
-        rr:child "Sport" ;
-        rr:parent "ID" ;
-      ]
-    ]
-  ] .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-		
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0009a-XML/sport.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/sports/sport"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/resource/sport_{ID}" ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate rdfs:label ; 
-    rr:objectMap [ rml:reference "Name" ];
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl
index 80440362..2967178a 100644
--- a/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010a-CSV/country info.csv";
+    rml:source "country info.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl.bak
deleted file mode 100644
index 80440362..00000000
--- a/src/test/resources/rml-testcases/RMLTC0010a-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,23 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010a-CSV/country info.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Country Code}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl
index 6c4d267c..b7b84993 100644
--- a/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010a-JSON/country info.json";
+    rml:source "country info.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl.bak
deleted file mode 100644
index 6c4d267c..00000000
--- a/src/test/resources/rml-testcases/RMLTC0010a-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010a-JSON/country info.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.countries[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Country Code}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl
index 6e4dbe4e..d1161091 100644
--- a/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010b-CSV/country info.csv";
+    rml:source "country info.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl.bak
deleted file mode 100644
index 6e4dbe4e..00000000
--- a/src/test/resources/rml-testcases/RMLTC0010b-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,23 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010b-CSV/country info.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Country Code}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl
index 5780b3fc..a9f9e1c5 100644
--- a/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-        rml:source "rml-testcases/RMLTC0010b-JSON/country info.json";
+        rml:source "country info.json";
 
      rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
diff --git a/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl.bak
deleted file mode 100644
index fed1de22..00000000
--- a/src/test/resources/rml-testcases/RMLTC0010b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010b-JSON/country info.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.countries[*]"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{Country Code}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl
index 7aec1f43..e5671357 100644
--- a/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010b-XML/country info.xml";
+    rml:source "country info.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl.bak
deleted file mode 100644
index 7aec1f43..00000000
--- a/src/test/resources/rml-testcases/RMLTC0010b-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010b-XML/country info.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/countries/country"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{CountryCode}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:name ;
-    rr:objectMap [ rml:reference "Name" ]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl
index 64644aeb..54a96d8a 100644
--- a/src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010c-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-CSV/country info.csv";
+    rml:source "country info.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl
index 576de2ab..680243a4 100644
--- a/src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010c-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-JSON/country info.json";
+    rml:source "country info.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl
index 2d2c9db5..c674d218 100644
--- a/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-XML/country info.xml";
+    rml:source "country info.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl.bak
deleted file mode 100644
index 157c218f..00000000
--- a/src/test/resources/rml-testcases/RMLTC0010c-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@prefix activity: <http://example.com/activity/> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0010c-XML/country info.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/countries/country"
-  ];
-
-  rr:subjectMap [ rr:template "http://example.com/{CountryCode}/{Name}" ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:code ;
-    rr:objectMap [ rr:template "\{\{\{ {ISO 3166} \}\}\}"; rr:termType rr:Literal]
-  ] .
diff --git a/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl
index 7021f6f4..1e0410b2 100644
--- a/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
@@ -37,7 +37,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-CSV/sport.csv";
+    rml:source "sport.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
@@ -63,7 +63,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-CSV/student_sport.csv";
+    rml:source "student_sport.csv";
     rml:referenceFormulation ql:CSV 
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl.bak
deleted file mode 100644
index 7021f6f4..00000000
--- a/src/test/resources/rml-testcases/RMLTC0011b-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,79 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-CSV/student.csv";
-    rml:referenceFormulation ql:CSV 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/student/{ID}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:firstName; 
-    rr:objectMap [
-      rml:reference "FirstName"
-    ]
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:lastName; 
-    rr:objectMap [
-      rml:reference "LastName"
-    ]
-  ].
-
-<TriplesMap2>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-CSV/sport.csv";
-    rml:referenceFormulation ql:CSV 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/sport/{ID}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id; 
-    rr:objectMap [
-      rml:reference "ID"
-    ]
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:description; 
-    rr:objectMap [
-      rml:reference "Description"
-    ]
-  ].
-
-<LinkMap_1_2>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-CSV/student_sport.csv";
-    rml:referenceFormulation ql:CSV 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/student/{ID_Student}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:plays; 
-    rr:objectMap [
-      rr:template "http://example.com/sport/{ID_Sport}"
-    ]
-  ].									
diff --git a/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl
index e5f8cbda..32936fdd 100644
--- a/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]" 
   ];
@@ -38,7 +38,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-JSON/sport.json";
+    rml:source "sport.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.sports[*]"
   ];
@@ -65,7 +65,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-JSON/student_sport.json";
+    rml:source "student_sport.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.links[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl.bak
deleted file mode 100644
index e5f8cbda..00000000
--- a/src/test/resources/rml-testcases/RMLTC0011b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,82 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]" 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/student/{ID}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:firstName; 
-    rr:objectMap [
-      rml:reference "FirstName"
-    ]
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:lastName; 
-    rr:objectMap [
-      rml:reference "LastName"
-    ]
-  ].
-
-<TriplesMap2>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-JSON/sport.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.sports[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/sport/{ID}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id; 
-    rr:objectMap [
-      rml:reference "ID"
-    ]
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:description; 
-    rr:objectMap [
-      rml:reference "Description"
-    ]
-  ].
-
-<LinkMap_1_2>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-JSON/student_sport.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.links[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/student/{ID_Student}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:plays; 
-    rr:objectMap [
-      rr:template "http://example.com/sport/{ID_Sport}"
-    ]
-  ].									
diff --git a/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl
index f9181c8d..d055d85f 100644
--- a/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Students/Student" 
   ];
@@ -38,7 +38,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-XML/sport.xml";
+    rml:source "sport.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Sports/Sport"
   ];
@@ -65,7 +65,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-XML/student_sport.xml";
+    rml:source "student_sport.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/links/link"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl.bak
deleted file mode 100644
index f9181c8d..00000000
--- a/src/test/resources/rml-testcases/RMLTC0011b-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,82 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-XML/student.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Students/Student" 
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/student/{ID}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:firstName; 
-    rr:objectMap [
-      rml:reference "FirstName"
-    ]
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:lastName; 
-    rr:objectMap [
-      rml:reference "LastName"
-    ]
-  ].
-
-<TriplesMap2>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-XML/sport.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Sports/Sport"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/sport/{ID}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:id; 
-    rr:objectMap [
-      rml:reference "ID"
-    ]
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:description; 
-    rr:objectMap [
-      rml:reference "Description"
-    ]
-  ].
-
-<LinkMap_1_2>
-  a rr:TriplesMap;
-    
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0011b-XML/student_sport.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/links/link"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/student/{ID_Student}";
-  ]; 
-	
-  rr:predicateObjectMap [ 
-    rr:predicate ex:plays; 
-    rr:objectMap [
-      rr:template "http://example.com/sport/{ID_Sport}"
-    ]
-  ].									
diff --git a/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl
index b875af25..fd3eb6fc 100644
--- a/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-CSV/persons.csv";
+    rml:source "persons.csv";
     rml:referenceFormulation ql:CSV
   ];
 	
diff --git a/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl.bak
deleted file mode 100644
index b875af25..00000000
--- a/src/test/resources/rml-testcases/RMLTC0012a-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl
index 09638b19..b969e995 100644
--- a/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl.bak
deleted file mode 100644
index 09638b19..00000000
--- a/src/test/resources/rml-testcases/RMLTC0012a-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-JSON/persons.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl
index 9e55c5d8..296bf515 100644
--- a/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-XML/persons.xml";
+    rml:source "persons.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Persons/Person"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl.bak
deleted file mode 100644
index 9e55c5d8..00000000
--- a/src/test/resources/rml-testcases/RMLTC0012a-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012a-XML/persons.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [ rr:template "{fname}{lname}{amount}"; rr:termType rr:BlankNode; ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-    
-  rr:predicateObjectMap [ 
-    rr:predicate ex:amount ; 
-    rr:objectMap    [ 
-      rml:reference "amount";
-    ]
-  ].
diff --git a/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl
index 71819182..0e962c75 100644
--- a/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-CSV/persons.csv";
+    rml:source "persons.csv";
     rml:referenceFormulation ql:CSV
   ];
 	
@@ -33,7 +33,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-CSV/lives.csv";
+    rml:source "lives.csv";
     rml:referenceFormulation ql:CSV
 ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl.bak
deleted file mode 100644
index 71819182..00000000
--- a/src/test/resources/rml-testcases/RMLTC0012b-CSV/mapping.ttl.bak
+++ /dev/null
@@ -1,52 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-CSV/persons.csv";
-    rml:referenceFormulation ql:CSV
-  ];
-	
-  rr:subjectMap [
-    rr:template "{fname}{lname}";
-    rr:termType rr:BlankNode ;
-  ];
-	
-  rr:predicateObjectMap [ 
-    rr:predicate foaf:name ; 
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-  .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-CSV/lives.csv";
-    rml:referenceFormulation ql:CSV
-];
-
-  rr:subjectMap [
-    rr:template "{fname}{lname}";
-    rr:termType rr:BlankNode;
-  ];
-
-  rr:predicateObjectMap
-  [
-    rr:predicate	ex:city ;
-    rr:objectMap    [
-      rml:reference "city";
-    ]
-];
-.
diff --git a/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl
index 5d92e047..74d9cd34 100644
--- a/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
@@ -34,7 +34,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-JSON/lives.json";
+    rml:source "lives.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.lives[*]"
 ];
diff --git a/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl.bak
deleted file mode 100644
index 5d92e047..00000000
--- a/src/test/resources/rml-testcases/RMLTC0012b-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-JSON/persons.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.persons[*]"
-  ];
-
-  rr:subjectMap [
-    rr:template "{fname}{lname}";
-    rr:termType rr:BlankNode ;
-  ];
-
-  rr:predicateObjectMap [
-    rr:predicate foaf:name ;
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-  .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-JSON/lives.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.lives[*]"
-];
-
-  rr:subjectMap [
-    rr:template "{fname}{lname}";
-    rr:termType rr:BlankNode;
-  ];
-
-  rr:predicateObjectMap
-  [
-    rr:predicate	ex:city ;
-    rr:objectMap    [
-      rml:reference "city";
-    ]
-];
-.
diff --git a/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl
index 72f8880f..f1cd0916 100644
--- a/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-XML/persons.xml";
+    rml:source "persons.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Persons/Person"
   ];
@@ -34,7 +34,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-XML/lives.xml";
+    rml:source "lives.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/Lives/Live"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl.bak
deleted file mode 100644
index 72f8880f..00000000
--- a/src/test/resources/rml-testcases/RMLTC0012b-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-XML/persons.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Persons/Person"
-  ];
-	
-  rr:subjectMap [
-    rr:template "{fname}{lname}";
-    rr:termType rr:BlankNode ;
-  ];
-
-  rr:predicateObjectMap [
-    rr:predicate foaf:name ;
-    rr:objectMap [
-      rr:template "{fname} {lname}";
-      rr:termType rr:Literal ;
-    ]
-  ];
-  .
-
-<TriplesMap2>
-  a rr:TriplesMap;
-
-  rml:logicalSource [
-    rml:source "rml-testcases//RMLTC0012b-XML/lives.xml";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/Lives/Live"
-  ];
-
-  rr:subjectMap [
-    rr:template "{fname}{lname}";
-    rr:termType rr:BlankNode;
-  ];
-
-  rr:predicateObjectMap
-  [
-    rr:predicate	ex:city ;
-    rr:objectMap    [
-      rml:reference "city";
-    ]
-];
-.
diff --git a/src/test/resources/rml-testcases/RMLTC0013a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0013a-JSON/mapping.ttl
index d5782623..9678f07c 100644
--- a/src/test/resources/rml-testcases/RMLTC0013a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0013a-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0013a-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0015a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0015a-CSV/mapping.ttl
index 763304b2..a89720fe 100644
--- a/src/test/resources/rml-testcases/RMLTC0015a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0015a-CSV/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0015a-CSV/country_en.csv";
+    rml:source "country_en.csv";
     rml:referenceFormulation ql:CSV
   ];
 
@@ -31,7 +31,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0015a-CSV/country_es.csv";
+    rml:source "country_es.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0015a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0015a-JSON/mapping.ttl
index 68039ccb..26ce6681 100644
--- a/src/test/resources/rml-testcases/RMLTC0015a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0015a-JSON/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0015a-JSON/country_en.json";
+    rml:source "country_en.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
@@ -32,7 +32,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0015a-JSON/country_es.json";
+    rml:source "country_es.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0015a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0015a-XML/mapping.ttl
index 49186d50..4abacbe7 100644
--- a/src/test/resources/rml-testcases/RMLTC0015a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0015a-XML/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0015a-XML/country_en.xml";
+    rml:source "country_en.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
@@ -32,7 +32,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC0015a-XML/country_es.xml";
+    rml:source "country_es.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0019a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0019a-CSV/mapping.ttl
index 47b3ed31..a5826211 100644
--- a/src/test/resources/rml-testcases/RMLTC0019a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0019a-CSV/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0019a-CSV/persons.csv";
+    rml:source "persons.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0019a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0019a-JSON/mapping.ttl
index d802b3c9..0958fc19 100644
--- a/src/test/resources/rml-testcases/RMLTC0019a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0019a-JSON/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0019a-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0019a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0019a-XML/mapping.ttl
index 15f8cf59..46eb3a27 100644
--- a/src/test/resources/rml-testcases/RMLTC0019a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0019a-XML/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0019a-XML/persons.xml";
+    rml:source "persons.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/persons/person"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0019b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0019b-CSV/mapping.ttl
index 4502b817..a5826211 100644
--- a/src/test/resources/rml-testcases/RMLTC0019b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0019b-CSV/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0019b-CSV/persons.csv";
+    rml:source "persons.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0019b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0019b-JSON/mapping.ttl
index 774d0c90..0958fc19 100644
--- a/src/test/resources/rml-testcases/RMLTC0019b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0019b-JSON/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0019b-JSON/persons.json";
+    rml:source "persons.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0019b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0019b-XML/mapping.ttl
index e5a0f963..46eb3a27 100644
--- a/src/test/resources/rml-testcases/RMLTC0019b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0019b-XML/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0019b-XML/persons.xml";
+    rml:source "persons.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/persons/person"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0020a-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0020a-CSV/mapping.ttl
index 24839804..8eb9f19a 100644
--- a/src/test/resources/rml-testcases/RMLTC0020a-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0020a-CSV/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0020a-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/rml-testcases/RMLTC0020a-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0020a-JSON/mapping.ttl
index 9749c9a5..c13bae39 100644
--- a/src/test/resources/rml-testcases/RMLTC0020a-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0020a-JSON/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0020a-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0020a-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0020a-XML/mapping.ttl
index c6754e0c..0a89c9de 100644
--- a/src/test/resources/rml-testcases/RMLTC0020a-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0020a-XML/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1>
   a rr:TriplesMap;
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0020a-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0020b-CSV/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0020b-CSV/mapping.ttl
index c8fb5f79..5df5e835 100644
--- a/src/test/resources/rml-testcases/RMLTC0020b-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0020b-CSV/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1>
   a rr:TriplesMap;
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0020b-CSV/student.csv";
+    rml:source "student.csv";
     rml:referenceFormulation ql:CSV
   ];
     
diff --git a/src/test/resources/rml-testcases/RMLTC0020b-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0020b-JSON/mapping.ttl
index 4dc4750b..287cb790 100644
--- a/src/test/resources/rml-testcases/RMLTC0020b-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0020b-JSON/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1>
   a rr:TriplesMap;
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0020b-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC0020b-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC0020b-XML/mapping.ttl
index 3fc1d88e..95968f28 100644
--- a/src/test/resources/rml-testcases/RMLTC0020b-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC0020b-XML/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1>
   a rr:TriplesMap;
   rml:logicalSource [
-    rml:source "rml-testcases/RMLTC0020b-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl b/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl
index 7e5bbf45..a0fa812e 100644
--- a/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl
@@ -10,7 +10,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC1001-JSON/student.json";
+    rml:source "student.json";
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl.bak
deleted file mode 100644
index b183abb4..00000000
--- a/src/test/resources/rml-testcases/RMLTC1001-JSON/mapping.ttl.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC1001-JSON/student.json";
-    rml:referenceFormulation ql:JSONPath;
-    rml:iterator "$.students[*]"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}"]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:Sport ;
-    rr:objectMap [ rml:reference "Sport" ]
-  ] .
-
-
diff --git a/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl b/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl
index b34a4e8b..e921719d 100644
--- a/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl
+++ b/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl
@@ -10,7 +10,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC1001-XML/student.xml";
+    rml:source "student.xml";
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl.bak b/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl.bak
deleted file mode 100644
index b6711b9d..00000000
--- a/src/test/resources/rml-testcases/RMLTC1001-XML/mapping.ttl.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
-@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
-@base <http://example.com/base/> .
-
-<TriplesMap1>
-  a rr:TriplesMap;
-
-  rml:logicalSource [ 
-    rml:source "rml-testcases/RMLTC1001-XML/student.json";
-    rml:referenceFormulation ql:XPath;
-    rml:iterator "/students/student"
-  ];
-
-  rr:subjectMap [ 
-    rr:template "http://example.com/Student/{ID}"]
-  ];
-
-  rr:predicateObjectMap [ 
-    rr:predicate ex:Sport ;
-    rr:objectMap [ rml:reference "Sport" ]
-  ] .
-
-
diff --git a/src/test/resources/sandbox/function_related/condition-function-on-po/data.json b/src/test/resources/sandbox/function_related/condition-function-on-po/data.json
new file mode 100644
index 00000000..3fb4e6cd
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-function-on-po/data.json
@@ -0,0 +1,16 @@
+{
+  "persons": [
+    {
+      "firstname": "John",
+      "lastname": "Doe"
+    },
+    {
+      "firstname": "Jane",
+      "lastname": "Smith"
+    },
+    {
+      "firstname": "Sarah",
+      "lastname": "Bladinck"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/condition-function-on-po/mapping.ttl b/src/test/resources/sandbox/function_related/condition-function-on-po/mapping.ttl
new file mode 100644
index 00000000..868ae982
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-function-on-po/mapping.ttl
@@ -0,0 +1,126 @@
+# NOTE: this mapping file was initially generated by the yarrrml-parser.
+#       However, rml:parentTermMap :ptm_0 was replaced with a constant.
+#
+#       More specifically, the following 
+#               :om_7 a rr:ObjectMap;
+#                   rml:parentTermMap :ptm_0.
+#               :ptm_0 rml:reference "firstname".
+#
+#       has been replaced with
+#               :om_7 a rr:ObjectMap;
+#                  rml:reference "firstname".
+
+@prefix rr: <http://www.w3.org/ns/r2rml#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix fnml: <http://semweb.mmlab.be/ns/fnml#>.
+@prefix fno: <https://w3id.org/function/ontology#>.
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#>.
+@prefix rml: <http://semweb.mmlab.be/ns/rml#>.
+@prefix ql: <http://semweb.mmlab.be/ns/ql#>.
+@prefix : <http://mapping.example.com/>.
+@prefix ex: <http://example.com/>.
+@prefix idlab-fn: <http://example.com/idlab/function/>.
+@prefix grel: <http://users.ugent.be/~bjdmeest/function/grel.ttl#>.
+
+:map_person_0 rml:logicalSource :source_0.
+:source_0 a rml:LogicalSource;
+    rml:source "data.json";
+    rml:iterator "$.persons[*]";
+    rml:referenceFormulation ql:JSONPath.
+:map_person_0 a rr:TriplesMap;
+    rdfs:label "person".
+:s_0 a rr:SubjectMap.
+:map_person_0 rr:subjectMap :s_0.
+:s_0 rr:template "http://example.com/{firstname}".
+:pom_0 a rr:PredicateObjectMap.
+:map_person_0 rr:predicateObjectMap :pom_0.
+:pm_0 a rr:PredicateMap.
+:pom_0 rr:predicateMap :pm_0.
+:pm_0 rr:constant rdf:type.
+:pom_0 rr:objectMap :om_0.
+:om_0 a rr:ObjectMap;
+    rr:constant "http://xmlns.com/foaf/0.1/Person";
+    rr:termType rr:IRI.
+:pom_1 a rr:PredicateObjectMap.
+:map_person_0 rr:predicateObjectMap :pom_1.
+:pm_1 a rr:PredicateMap.
+:pom_1 rr:predicateMap :pm_1.
+:pm_1 rr:constant <http://xmlns.com/foaf/0.1/firstName>.
+:pom_1 rr:objectMap :om_1.
+:om_1 a fnml:FunctionTermMap;
+    rr:termType rr:Literal;
+    fnml:functionValue :fn_0.
+:fn_0 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_0.
+:pomexec_0 rr:predicateMap :pmexec_0.
+:pmexec_0 rr:constant fno:executes.
+:pomexec_0 rr:objectMap :omexec_0.
+:omexec_0 rr:constant "http://example.com/idlab/function/trueCondition";
+    rr:termType rr:IRI.
+:fn_0 rr:predicateObjectMap :pom_2.
+:pom_2 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_2.
+:pm_2 a rr:PredicateMap;
+    rr:constant idlab-fn:strBoolean.
+:pom_2 rr:objectMap :om_2.
+:om_2 a rr:ObjectMap, fnml:FunctionTermMap;
+    fnml:functionValue :fn_1.
+:fn_1 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_1.
+:pomexec_1 rr:predicateMap :pmexec_1.
+:pmexec_1 rr:constant fno:executes.
+:pomexec_1 rr:objectMap :omexec_1.
+:omexec_1 rr:constant "http://example.com/idlab/function/stringContainsOtherString";
+    rr:termType rr:IRI.
+:fn_1 rr:predicateObjectMap :pom_3.
+:pom_3 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_3.
+:pm_3 a rr:PredicateMap;
+    rr:constant idlab-fn:str.
+:pom_3 rr:objectMap :om_3.
+:om_3 a rr:ObjectMap;
+    rml:reference "firstname";
+    rr:termType rr:Literal.
+:fn_1 rr:predicateObjectMap :pom_4.
+:pom_4 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_4.
+:pm_4 a rr:PredicateMap;
+    rr:constant idlab-fn:otherStr.
+:pom_4 rr:objectMap :om_4.
+:om_4 a rr:ObjectMap;
+    rr:constant "J";
+    rr:termType rr:Literal.
+:fn_1 rr:predicateObjectMap :pom_5.
+:pom_5 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_5.
+:pm_5 a rr:PredicateMap;
+    rr:constant idlab-fn:delimiter.
+:pom_5 rr:objectMap :om_5.
+:om_5 a rr:ObjectMap;
+    rr:constant "";
+    rr:termType rr:Literal.
+:fn_0 rr:predicateObjectMap :pom_6.
+:pom_6 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_6.
+:pm_6 a rr:PredicateMap;
+    rr:constant idlab-fn:str.
+:pom_6 rr:objectMap :om_6.
+:om_6 a rr:ObjectMap, fnml:FunctionTermMap;
+    fnml:functionValue :fn_2.
+:fn_2 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_2.
+:pomexec_2 rr:predicateMap :pmexec_2.
+:pmexec_2 rr:constant fno:executes.
+:pomexec_2 rr:objectMap :omexec_2.
+:omexec_2 rr:constant "http://users.ugent.be/~bjdmeest/function/grel.ttl#toUpperCase";
+    rr:termType rr:IRI.
+:fn_2 rr:predicateObjectMap :pom_7.
+:pom_7 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_7.
+:pm_7 a rr:PredicateMap;
+    rr:constant grel:valueParameter.
+:pom_7 rr:objectMap :om_7.
+:om_7 a rr:ObjectMap;
+    rml:reference "firstname".
+
diff --git a/src/test/resources/sandbox/function_related/condition-function-on-po/mapping.yarrrml b/src/test/resources/sandbox/function_related/condition-function-on-po/mapping.yarrrml
new file mode 100644
index 00000000..b859e3d1
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-function-on-po/mapping.yarrrml
@@ -0,0 +1,24 @@
+prefixes:
+  ex: "http://example.com/"
+  idlab-fn: http://example.com/idlab/function/
+  grel: http://users.ugent.be/~bjdmeest/function/grel.ttl#
+
+mappings:
+  person:
+    sources:
+      - ['data.json~jsonpath', '$.persons[*]']
+    s: http://example.com/$(firstname)
+    po:
+      - [a, foaf:Person]
+      - predicates: foaf:firstName
+        objects:
+          - function: grel:toUpperCase
+            parameters:
+              - parameter: grel:valueParameter
+                value: $(firstname)
+        condition:
+          function: idlab-fn:stringContainsOtherString
+          parameters:
+            - [idlab-fn:str, $(firstname)]
+            - [idlab-fn:otherStr, "J"]
+            - [idlab-fn:delimiter, ""]
diff --git a/src/test/resources/sandbox/function_related/condition-function-on-po/output.ttl b/src/test/resources/sandbox/function_related/condition-function-on-po/output.ttl
new file mode 100644
index 00000000..f8319922
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-function-on-po/output.ttl
@@ -0,0 +1,5 @@
+<http://example.com/John> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>.
+<http://example.com/John> <http://xmlns.com/foaf/0.1/firstName> "JOHN".
+<http://example.com/Jane> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>.
+<http://example.com/Jane> <http://xmlns.com/foaf/0.1/firstName> "JANE".
+<http://example.com/Sarah> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>.
diff --git a/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/input.csv b/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/input.csv
new file mode 100644
index 00000000..a87b05fc
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/input.csv
@@ -0,0 +1,4 @@
+id
+0
+""
+1
diff --git a/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/mapping.ttl b/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/mapping.ttl
new file mode 100644
index 00000000..65eb30fa
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/mapping.ttl
@@ -0,0 +1,83 @@
+# condition on subject map (id notEqual "")
+@prefix rr: <http://www.w3.org/ns/r2rml#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix fnml: <http://semweb.mmlab.be/ns/fnml#>.
+@prefix fno: <https://w3id.org/function/ontology#>.
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#>.
+@prefix rml: <http://semweb.mmlab.be/ns/rml#>.
+@prefix ql: <http://semweb.mmlab.be/ns/ql#>.
+@prefix : <http://mapping.example.com/>.
+@prefix grel: <http://users.ugent.be/~bjdmeest/function/grel.ttl#>.
+@prefix idlab-fn: <http://example.com/idlab/function/>.
+
+:map_person_0 rml:logicalSource :source_0.
+:source_0 a rml:LogicalSource;
+    rml:source "input.csv";
+    rml:referenceFormulation ql:CSV.
+:map_person_0 a rr:TriplesMap;
+    rdfs:label "person".
+:s_0 a rr:SubjectMap.
+:map_person_0 rr:subjectMap :s_0.
+:s_0 a fnml:FunctionTermMap;
+    rr:termType rr:IRI;
+    fnml:functionValue :fn_0.
+:fn_0 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_0.
+:pomexec_0 rr:predicateMap :pmexec_0.
+:pmexec_0 rr:constant fno:executes.
+:pomexec_0 rr:objectMap :omexec_0.
+:omexec_0 rr:constant "http://example.com/idlab/function/trueCondition";
+    rr:termType rr:IRI.
+:fn_0 rr:predicateObjectMap :pom_0.
+:pom_0 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_0.
+:pm_0 a rr:PredicateMap;
+    rr:constant idlab-fn:strBoolean.
+:pom_0 rr:objectMap :om_0.
+:om_0 a rr:ObjectMap, fnml:FunctionTermMap;
+    fnml:functionValue :fn_1.
+:fn_1 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_1.
+:pomexec_1 rr:predicateMap :pmexec_1.
+:pmexec_1 rr:constant fno:executes.
+:pomexec_1 rr:objectMap :omexec_1.
+:omexec_1 rr:constant "http://example.com/idlab/function/notEqual";
+    rr:termType rr:IRI.
+:fn_1 rr:predicateObjectMap :pom_1.
+:pom_1 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_1.
+:pm_1 a rr:PredicateMap;
+    rr:constant grel:valueParameter.
+:pom_1 rr:objectMap :om_1.
+:om_1 a rr:ObjectMap;
+    rml:reference "id";
+    rr:termType rr:Literal.
+:fn_1 rr:predicateObjectMap :pom_2.
+:pom_2 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_2.
+:pm_2 a rr:PredicateMap;
+    rr:constant grel:valueParameter2.
+:pom_2 rr:objectMap :om_2.
+:om_2 a rr:ObjectMap;
+    rr:constant "";
+    rr:termType rr:Literal.
+:fn_0 rr:predicateObjectMap :pom_3.
+:pom_3 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_3.
+:pm_3 a rr:PredicateMap;
+    rr:constant idlab-fn:str.
+:pom_3 rr:objectMap :om_3.
+:om_3 a rr:ObjectMap;
+    rr:template "http://world.org/person/{id}";
+    rr:termType rr:Literal.
+:pom_4 a rr:PredicateObjectMap.
+:map_person_0 rr:predicateObjectMap :pom_4.
+:pm_4 a rr:PredicateMap.
+:pom_4 rr:predicateMap :pm_4.
+:pm_4 rr:constant rdf:type.
+:pom_4 rr:objectMap :om_4.
+:om_4 a rr:ObjectMap;
+    rr:constant "http://schema.org/Person";
+    rr:termType rr:IRI.
+
diff --git a/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/output.ttl b/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/output.ttl
new file mode 100644
index 00000000..5a58c399
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-mapping-subject-function/output.ttl
@@ -0,0 +1,2 @@
+<http://world.org/person/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person>.
+<http://world.org/person/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person>.
diff --git a/src/test/resources/sandbox/function_related/condition-on-po/mapping.rml.ttl b/src/test/resources/sandbox/function_related/condition-on-po/mapping.rml.ttl
new file mode 100644
index 00000000..85b9834c
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-po/mapping.rml.ttl
@@ -0,0 +1,84 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix fnml: <http://semweb.mmlab.be/ns/fnml#>.
+@prefix fno: <https://w3id.org/function/ontology#>.
+@prefix rml: <http://semweb.mmlab.be/ns/rml#>.
+@prefix ql: <http://semweb.mmlab.be/ns/ql#>.
+@prefix : <http://mapping.example.com/>.
+@prefix grel: <http://users.ugent.be/~bjdmeest/function/grel.ttl#>.
+@prefix idlab-fn: <http://example.com/idlab/function/>.
+
+:map_person_0 rml:logicalSource :source_0.
+:source_0 a rml:LogicalSource;
+    rml:source "test.csv";
+    rml:referenceFormulation ql:CSV.
+:map_person_0 a rr:TriplesMap;
+    rdfs:label "person".
+
+:s_0 a rr:SubjectMap.
+:map_person_0 rr:subjectMap :s_0.
+:s_0 rr:template "http://example.org/{firstname}".
+
+:pom_0 a rr:PredicateObjectMap.
+:map_person_0 rr:predicateObjectMap :pom_0.
+
+:pm_0 a rr:PredicateMap.
+:pom_0 rr:predicateMap :pm_0.
+:pm_0 rr:constant <http://xmlns.com/foaf/0.1/firstName>.
+:pom_0 rr:objectMap :om_0.
+
+
+
+:om_0 a fnml:FunctionTermMap;
+    rr:termType rr:Literal;
+    fnml:functionValue :fn_0.
+:fn_0 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_0.
+:pomexec_0 rr:predicateMap :pmexec_0.
+:pmexec_0 rr:constant fno:executes.
+:pomexec_0 rr:objectMap :omexec_0.
+:omexec_0 rr:constant "http://example.com/idlab/function/trueCondition";
+    rr:termType rr:IRI.
+:fn_0 rr:predicateObjectMap :pom_1.
+:pom_1 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_1.
+:pm_1 a rr:PredicateMap;
+    rr:constant idlab-fn:strBoolean.
+:pom_1 rr:objectMap :om_1.
+:om_1 a rr:ObjectMap;
+    fnml:functionValue :fn_1.
+:fn_1 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_1.
+:pomexec_1 rr:predicateMap :pmexec_1.
+:pmexec_1 rr:constant fno:executes.
+:pomexec_1 rr:objectMap :omexec_1.
+:omexec_1 rr:constant "http://example.com/idlab/function/equal";
+    rr:termType rr:IRI.
+:fn_1 rr:predicateObjectMap :pom_2.
+:pom_2 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_2.
+:pm_2 a rr:PredicateMap;
+    rr:constant grel:valueParameter.
+:pom_2 rr:objectMap :om_2.
+:om_2 a rr:ObjectMap;
+    rml:reference "firstname";
+    rr:termType rr:Literal.
+:fn_1 rr:predicateObjectMap :pom_3.
+:pom_3 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_3.
+:pm_3 a rr:PredicateMap;
+    rr:constant grel:valueParameter2.
+:pom_3 rr:objectMap :om_3.
+:om_3 a rr:ObjectMap;
+    rr:constant "test";
+    rr:termType rr:Literal.
+:fn_0 rr:predicateObjectMap :pom_4.
+:pom_4 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_4.
+:pm_4 a rr:PredicateMap;
+    rr:constant idlab-fn:str.
+:pom_4 rr:objectMap :om_4.
+:om_4 a rr:ObjectMap;
+    rml:reference "firstname";
+    rr:termType rr:Literal.
diff --git a/src/test/resources/sandbox/function_related/condition-on-po/mapping.yml b/src/test/resources/sandbox/function_related/condition-on-po/mapping.yml
new file mode 100644
index 00000000..466e07b2
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-po/mapping.yml
@@ -0,0 +1,17 @@
+prefixes:
+  grel: http://users.ugent.be/~bjdmeest/function/grel.ttl#
+  idlab-fn: http://example.com/idlab/function/
+
+mappings:
+  person:
+    sources:
+     - [test.csv~csv]
+    subject: http://example.org/$(firstname)
+    predicateobjects:
+     - predicates: foaf:firstName
+       objects: $(firstname)
+       condition:
+        function: idlab-fn:equal
+        parameters:
+         - [grel:valueParameter, $(firstname)]
+         - [grel:valueParameter2, "test"]
diff --git a/src/test/resources/sandbox/function_related/condition-on-po/output.ttl b/src/test/resources/sandbox/function_related/condition-on-po/output.ttl
new file mode 100644
index 00000000..cf12a8bc
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-po/output.ttl
@@ -0,0 +1 @@
+<http://example.org/test> <http://xmlns.com/foaf/0.1/firstName> "test".
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/condition-on-po/test.csv b/src/test/resources/sandbox/function_related/condition-on-po/test.csv
new file mode 100644
index 00000000..27c5d022
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/condition-on-po/test.csv
@@ -0,0 +1,3 @@
+firstname
+test,
+test2
diff --git a/src/test/resources/sandbox/function_related/contains/mapping.ttl b/src/test/resources/sandbox/function_related/contains/mapping.ttl
new file mode 100644
index 00000000..c2943914
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/contains/mapping.ttl
@@ -0,0 +1,49 @@
+# Function on graph, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../../../fno-testcases/student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate ex:contains_us;
+    rr:objectMap [ 
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant grel:string_contains ] ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ];
+
+        rr:predicateObjectMap [
+          rr:predicate grel:string_sub ;
+          rr:objectMap [ rr:constant "us" ] ]
+
+      ] ;
+
+
+    ] ;
+    
+  ].
diff --git a/src/test/resources/sandbox/function_related/contains/output.nq b/src/test/resources/sandbox/function_related/contains/output.nq
new file mode 100644
index 00000000..5c813d81
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/contains/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://example.com/contains_us> "true" .
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/controls_if_contains/mapping.ttl b/src/test/resources/sandbox/function_related/controls_if_contains/mapping.ttl
new file mode 100644
index 00000000..6f2eff30
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_contains/mapping.ttl
@@ -0,0 +1,80 @@
+# Generate literals using grel:controls_if and grel:string_contains
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+                      rml:source "../student.csv";
+                      rml:referenceFormulation ql:CSV
+                    ];
+
+  rr:subjectMap [
+                  rr:template "http://example.com/{Name}"
+                ];
+
+  rr:predicateObjectMap [
+                          rr:predicate ex:contains_us;
+                          rr:objectMap [
+                                         fnml:functionValue [
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate fno:executes ;
+                                                                                      rr:objectMap [ rr:constant grel:controls_if ] ] ;
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:bool_b ;
+                                                                                      rr:objectMap  <ContainsMap>
+
+                                                                                    ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_true ;
+                                                                                      rr:objectMap [ 
+                                                                                        rr:template "{Name} contains us" ;
+                                                                                        rr:termType rr:Literal
+                                                                                    ]
+                                                              ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_false ;
+                                                                                      rr:objectMap [ 
+                                                                                        rr:template "{Name} does NOT contain us" ; 
+                                                                                        rr:termType rr:Literal;
+                                                                                      ] 
+                                                                                    ]
+
+                                                            ] ;
+
+
+                                       ] ;
+
+                        ].
+<ContainsMap>
+fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant grel:string_contains ] ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ];
+
+        rr:predicateObjectMap [
+          rr:predicate grel:string_sub ;
+          rr:objectMap [ rr:constant "us" ] ]
+
+      ] .
+
+
diff --git a/src/test/resources/sandbox/function_related/controls_if_contains/output.nq b/src/test/resources/sandbox/function_related/controls_if_contains/output.nq
new file mode 100644
index 00000000..076406d8
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_contains/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Algebra> <http://example.com/contains_us> "Algebra does NOT contain us" .
+<http://example.com/Venus> <http://example.com/contains_us> "Venus contains us" .
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/controls_if_contains_true_execute_triplesmap/mapping.ttl b/src/test/resources/sandbox/function_related/controls_if_contains_true_execute_triplesmap/mapping.ttl
new file mode 100644
index 00000000..78ad86ce
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_contains_true_execute_triplesmap/mapping.ttl
@@ -0,0 +1,86 @@
+# Generate [TODO] using grel:controls_if and grel:string_contains
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+                      rml:source "../student.csv";
+                      rml:referenceFormulation ql:CSV
+                    ];
+
+  rr:subjectMap [
+                  rr:template "http://example.com/{Name}"
+                ];
+
+  rr:predicateObjectMap [
+                          rr:predicate ex:contains_us;
+                          rr:objectMap [
+                                         fnml:functionValue [
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate fno:executes ;
+                                                                                      rr:objectMap [ rr:constant grel:controls_if ] ] ;
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:bool_b ;
+                                                                                      rr:objectMap  <ContainsMap>
+
+                                                                                    ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_true ;
+                                                                                      rr:objectMap <POM1>
+                                                                                        
+                                                                                    
+                                                              ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_false ;
+                                                                                      rr:objectMap [ 
+                                                                                        rr:template "{Name} does NOT contain us" ; 
+                                                                                        rr:termType rr:Literal;
+                                                                                      ] 
+                                                                                    ]
+
+                                                            ] ;
+
+
+                                       ] ;
+
+                        ].
+<ContainsMap>
+fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant grel:string_contains ] ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ];
+
+        rr:predicateObjectMap [
+          rr:predicate grel:string_sub ;
+          rr:objectMap [ rr:constant "us" ] ]
+
+      ] .
+
+
+
+
+<POM1>
+rr:predicateObjectMap [
+    rr:predicate ex:testje;
+    rr:object "TRUEMAP";
+  ].
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/controls_if_contains_true_execute_triplesmap/output.nq b/src/test/resources/sandbox/function_related/controls_if_contains_true_execute_triplesmap/output.nq
new file mode 100644
index 00000000..1406dc9b
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_contains_true_execute_triplesmap/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Algebra> <http://example.com/contains_us> "Algebra" .
+<http://example.com/Venus> <http://example.com/contains_us> "Venus" .
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/controls_if_false/mapping.ttl b/src/test/resources/sandbox/function_related/controls_if_false/mapping.ttl
new file mode 100644
index 00000000..f9cc6ed2
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_false/mapping.ttl
@@ -0,0 +1,53 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+                      rml:source "../student.csv";
+                      rml:referenceFormulation ql:CSV
+                    ];
+
+  rr:subjectMap [
+                  rr:template "http://example.com/{Name}"
+                ];
+
+  rr:predicateObjectMap [
+                          rr:predicate ex:if_false_example;
+                          rr:objectMap [
+                                         fnml:functionValue [
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate fno:executes ;
+                                                                                      rr:objectMap [ rr:constant grel:controls_if ] ] ;
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:bool_b ;
+                                                                                      rr:object  "false"
+
+                                                                                    ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_true ;
+                                                                                      rr:objectMap [ rml:reference "Name"; rr:datatype xsd:string ] ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_false ;
+                                                                                      rr:objectMap [ rr:constant "IF_CLAUSE_WAS_FALSE" ] ]
+
+                                                            ] ;
+
+
+                                       ] ;
+
+                        ].
diff --git a/src/test/resources/sandbox/function_related/controls_if_false/output.nq b/src/test/resources/sandbox/function_related/controls_if_false/output.nq
new file mode 100644
index 00000000..97d867eb
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_false/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Algebra> <http://example.com/if_false_example> "IF_CLAUSE_WAS_FALSE" .
+<http://example.com/Venus> <http://example.com/if_false_example> "IF_CLAUSE_WAS_FALSE" .
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/controls_if_true/mapping.ttl b/src/test/resources/sandbox/function_related/controls_if_true/mapping.ttl
new file mode 100644
index 00000000..823ae039
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_true/mapping.ttl
@@ -0,0 +1,53 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+                      rml:source "../student.csv";
+                      rml:referenceFormulation ql:CSV
+                    ];
+
+  rr:subjectMap [
+                  rr:template "http://example.com/{Name}"
+                ];
+
+  rr:predicateObjectMap [
+                          rr:predicate ex:contains_us;
+                          rr:objectMap [
+                                         fnml:functionValue [
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate fno:executes ;
+                                                                                      rr:objectMap [ rr:constant grel:controls_if ] ] ;
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:bool_b ;
+                                                                                      rr:object  "true"
+
+                                                                                    ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_true ;
+                                                                                      rr:objectMap [ rml:reference "Name"; rr:datatype xsd:string ] ];
+
+                                                              rr:predicateObjectMap [
+                                                                                      rr:predicate grel:any_false ;
+                                                                                      rr:objectMap [ rr:constant "IF_CLAUSE_WAS_FALSE" ] ]
+
+                                                            ] ;
+
+
+                                       ] ;
+
+                        ].
diff --git a/src/test/resources/sandbox/function_related/controls_if_true/output.nq b/src/test/resources/sandbox/function_related/controls_if_true/output.nq
new file mode 100644
index 00000000..1406dc9b
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/controls_if_true/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Algebra> <http://example.com/contains_us> "Algebra" .
+<http://example.com/Venus> <http://example.com/contains_us> "Venus" .
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/equal/mapping.ttl b/src/test/resources/sandbox/function_related/equal/mapping.ttl
new file mode 100644
index 00000000..34d20ca8
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/equal/mapping.ttl
@@ -0,0 +1,47 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate ex:isEqual;
+    rr:objectMap [ 
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant idlab-fn:equal ] ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ];
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter2 ;
+          rr:objectMap [ rr:constant "Venus" ] ]
+
+      ] ;
+
+
+    ] ;
+    
+  ].
diff --git a/src/test/resources/sandbox/function_related/equal/output.nq b/src/test/resources/sandbox/function_related/equal/output.nq
new file mode 100644
index 00000000..995fc00c
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/equal/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Venus> <http://example.com/isEqual> "true".
+<http://example.com/Algebra> <http://example.com/isEqual> "false".
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/notEqual/mapping.ttl b/src/test/resources/sandbox/function_related/notEqual/mapping.ttl
new file mode 100644
index 00000000..5f66daab
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/notEqual/mapping.ttl
@@ -0,0 +1,47 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate ex:isNotEqual;
+    rr:objectMap [ 
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant idlab-fn:notEqual ] ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ];
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter2 ;
+          rr:objectMap [ rr:constant "Venus" ] ]
+
+      ] ;
+
+
+    ] ;
+    
+  ].
diff --git a/src/test/resources/sandbox/function_related/notEqual/output.nq b/src/test/resources/sandbox/function_related/notEqual/output.nq
new file mode 100644
index 00000000..caa1c8fe
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/notEqual/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Venus> <http://example.com/isNotEqual> "false".
+<http://example.com/Algebra> <http://example.com/isNotEqual> "true".
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/student.csv b/src/test/resources/sandbox/function_related/student.csv
new file mode 100644
index 00000000..fdc5dc5c
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/student.csv
@@ -0,0 +1,3 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
+2,Algebra,NoComment,B
diff --git a/src/test/resources/sandbox/function_related/using_trueCondition_and_contains/mapping.ttl b/src/test/resources/sandbox/function_related/using_trueCondition_and_contains/mapping.ttl
new file mode 100644
index 00000000..07a6bf70
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/using_trueCondition_and_contains/mapping.ttl
@@ -0,0 +1,65 @@
+# generate triples using trueCondition and contains
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap <ContainsMap>
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
+
+<ContainsMap>
+    fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant grel:string_contains ] ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate grel:valueParameter ;
+          rr:objectMap [ rml:reference "Name" ] ];
+
+        rr:predicateObjectMap [
+          rr:predicate grel:string_sub ;
+          rr:objectMap [ rr:constant "us" ] ]
+
+      ] ;
+.
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/using_trueCondition_and_contains/output.ttl b/src/test/resources/sandbox/function_related/using_trueCondition_and_contains/output.ttl
new file mode 100644
index 00000000..8d800662
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/using_trueCondition_and_contains/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
diff --git a/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/mapping.ttl b/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/mapping.ttl
new file mode 100644
index 00000000..afaf3df2
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/mapping.ttl
@@ -0,0 +1,67 @@
+# generate triples using trueCondition and Equal
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source "../student.csv";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap <isEqualMap>
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
+
+<isEqualMap>
+    fnml:functionValue [
+                           rr:predicateObjectMap [
+                                                     rr:predicate fno:executes ;
+                                                     rr:objectMap [ rr:constant idlab-fn:equal ]
+                                                 ];
+
+                           rr:predicateObjectMap [
+                                                     rr:predicate grel:valueParameter ;
+                                                     rr:objectMap [ rr:constant "Venus"]
+                                                 ] ;
+
+                           rr:predicateObjectMap [
+                                                     rr:predicate grel:valueParameter2 ;
+                                                     rr:objectMap [ rml:reference "Name" ]
+                                                 ]
+                       ]
+.
\ No newline at end of file
diff --git a/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/output.ttl b/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/output.ttl
new file mode 100644
index 00000000..8d800662
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
diff --git a/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/student.csv b/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/student.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/sandbox/function_related/using_trueCondition_and_equal/student.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/mapping.ttl
new file mode 100644
index 00000000..63e5895c
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/mapping.ttl
@@ -0,0 +1,49 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/output.ttl
new file mode 100644
index 00000000..b0369690
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0001-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "VENUS" .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/mapping.ttl
new file mode 100644
index 00000000..2744f4aa
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/mapping.ttl
@@ -0,0 +1,48 @@
+# Function on object, 1 constant parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rr:constant "name" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/output.ttl
new file mode 100644
index 00000000..fb8edf94
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0002-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "NAME" .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/mapping.ttl
new file mode 100644
index 00000000..3f024829
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/mapping.ttl
@@ -0,0 +1,51 @@
+# Function on object, 2 parameters
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:escape ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Comment" ] ] ;
+      	rr:predicateObjectMap [
+            rr:predicate grel:modeParameter ;
+            rr:objectMap [ rr:constant "html" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/output.ttl
new file mode 100644
index 00000000..af03220c
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0003-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "A&amp;B" .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/mapping.ttl
new file mode 100644
index 00000000..3c13e760
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/mapping.ttl
@@ -0,0 +1,49 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicateMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate idlab-fn:str ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ];
+    rr:objectMap [ rr:constant foaf:name ; rr:termType rr:IRI ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/output.ttl
new file mode 100644
index 00000000..4aa4759e
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0004-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://VENUS> <http://xmlns.com/foaf/0.1/name> .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/datasource.csv
new file mode 100644
index 00000000..c33048c8
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,url
+1,Venus,www.example.com
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/mapping.ttl
new file mode 100644
index 00000000..4507a467
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/mapping.ttl
@@ -0,0 +1,47 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    fnml:functionValue [
+      rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+        rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+      rr:predicateObjectMap [
+        rr:predicate idlab-fn:str ;
+        rr:objectMap [ rml:reference "url" ] ]
+    ] ;
+    rr:termType rr:IRI
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/output.ttl
new file mode 100644
index 00000000..80493637
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0005-CSV/output.ttl
@@ -0,0 +1 @@
+<http://WWW.EXAMPLE.COM> <http://xmlns.com/foaf/0.1/name> "Venus" .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/mapping.ttl
new file mode 100644
index 00000000..bda80750
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/mapping.ttl
@@ -0,0 +1,50 @@
+# Function on graph, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"] ;
+    rr:graphMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/output.nq b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/output.nq
new file mode 100644
index 00000000..2258872a
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0006-CSV/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://VENUS> .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/mapping.ttl
new file mode 100644
index 00000000..8dc69696
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/mapping.ttl
@@ -0,0 +1,48 @@
+# Function on object, 1 false reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:   <https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel:   <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+        rr:objectMap [ rml:reference "WrongReference" ] ]
+        ]
+      ]
+    ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0007-CSV/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/mapping.ttl
new file mode 100644
index 00000000..834cf02c
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/mapping.ttl
@@ -0,0 +1,48 @@
+# Function on object, 1 template parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:   <https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel:   <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+        rr:objectMap [ rr:template "Name: {Name}" ; rr:termType rr:Literal ] ]
+        ]
+      ]
+    ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/output.ttl
new file mode 100644
index 00000000..5b69f570
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0008-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "NAME: VENUS".
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/mapping.ttl
new file mode 100644
index 00000000..cd60f869
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/mapping.ttl
@@ -0,0 +1,48 @@
+# Function on object returns empty string
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+      rr:predicate foaf:name;
+      rr:objectMap [
+        fnml:functionValue [
+        	rr:predicateObjectMap [
+        		rr:predicate fno:executes ;
+        		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+        	rr:predicateObjectMap [
+        		rr:predicate grel:valueParameter ;
+        		rr:objectMap [ rr:constant "" ] ]
+        ]
+      ]
+    ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/output.ttl
new file mode 100644
index 00000000..6629e021
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0013-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "" .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/datasource.csv
new file mode 100644
index 00000000..12614593
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/datasource.csv
@@ -0,0 +1,2 @@
+id,name
+0,ben & pieter
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/mapping.ttl
new file mode 100644
index 00000000..205144cf
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/mapping.ttl
@@ -0,0 +1,61 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{id}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+            rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:escape ] ] ;
+        rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+            rr:objectMap [
+                fnml:functionValue [
+                    rr:predicateObjectMap [
+                        rr:predicate fno:executes ;
+                        rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+                    rr:predicateObjectMap [
+                        rr:predicate grel:valueParameter ;
+                        rr:objectMap [ rml:reference "name" ] ]
+                ]
+            ] ;
+        ];
+        rr:predicateObjectMap [
+            rr:predicate grel:modeParameter ;
+            rr:objectMap [ rr:constant "html" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/output.ttl
new file mode 100644
index 00000000..2296c1ec
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTC0018-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/0> <http://xmlns.com/foaf/0.1/name> "BEN &amp; PIETER" .
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/mapping.ttl
new file mode 100644
index 00000000..023c01c3
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/mapping.ttl
@@ -0,0 +1,57 @@
+# test true condition
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap [ rr:constant "true"]
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/output.ttl
new file mode 100644
index 00000000..de68d8c0
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/datasource.csv b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/mapping.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/mapping.ttl
new file mode 100644
index 00000000..649ce9ea
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/mapping.ttl
@@ -0,0 +1,57 @@
+# test true condition
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+          rml:source [
+
+              rdf:type rmls:KafkaStream ;
+              rmls:broker "localhost:9092";
+              rmls:groupId "2";
+              rmls:topic "demo"
+          ];
+              rml:referenceFormulation ql:CSV
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap [ rr:constant "false"]
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/output.ttl b/src/test/resources/stream/fno-testcases/kafka/RMLFNOTCA004b/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/mapping.ttl
new file mode 100644
index 00000000..fc1ec139
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/mapping.ttl
@@ -0,0 +1,47 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/output.ttl
new file mode 100644
index 00000000..b0369690
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0001-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "VENUS" .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/mapping.ttl
new file mode 100644
index 00000000..e96ae332
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/mapping.ttl
@@ -0,0 +1,46 @@
+# Function on object, 1 constant parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rr:constant "name" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/output.ttl
new file mode 100644
index 00000000..fb8edf94
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0002-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "NAME" .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/mapping.ttl
new file mode 100644
index 00000000..3dca3dec
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/mapping.ttl
@@ -0,0 +1,49 @@
+# Function on object, 2 parameters
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant grel:escape ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate grel:valueParameter ;
+      		rr:objectMap [ rml:reference "Comment" ] ] ;
+      	rr:predicateObjectMap [
+            rr:predicate grel:modeParameter ;
+            rr:objectMap [ rr:constant "html" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/output.ttl
new file mode 100644
index 00000000..af03220c
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0003-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "A&amp;B" .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/mapping.ttl
new file mode 100644
index 00000000..65f87b91
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/mapping.ttl
@@ -0,0 +1,47 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicateMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+      	rr:predicateObjectMap [
+      		rr:predicate idlab-fn:str ;
+      		rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ];
+    rr:objectMap [ rr:constant foaf:name ; rr:termType rr:IRI ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/output.ttl
new file mode 100644
index 00000000..4aa4759e
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0004-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://VENUS> <http://xmlns.com/foaf/0.1/name> .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/datasource.csv
new file mode 100644
index 00000000..c33048c8
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,url
+1,Venus,www.example.com
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/mapping.ttl
new file mode 100644
index 00000000..1bf55b63
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/mapping.ttl
@@ -0,0 +1,45 @@
+# Function on predicate, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    fnml:functionValue [
+      rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+        rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+      rr:predicateObjectMap [
+        rr:predicate idlab-fn:str ;
+        rr:objectMap [ rml:reference "url" ] ]
+    ] ;
+    rr:termType rr:IRI
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/output.ttl
new file mode 100644
index 00000000..80493637
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0005-CSV/output.ttl
@@ -0,0 +1 @@
+<http://WWW.EXAMPLE.COM> <http://xmlns.com/foaf/0.1/name> "Venus" .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/mapping.ttl
new file mode 100644
index 00000000..ba9b4510
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/mapping.ttl
@@ -0,0 +1,48 @@
+# Function on graph, 1 parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name"] ;
+    rr:graphMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+          rr:predicate fno:executes ;
+          rr:objectMap [ rr:constant idlab-fn:toUpperCaseURL ] ] ;
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ] ]
+      ] ;
+      rr:termType rr:IRI
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/output.nq b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/output.nq
new file mode 100644
index 00000000..2258872a
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0006-CSV/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://VENUS> .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/mapping.ttl
new file mode 100644
index 00000000..1a53c5ea
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/mapping.ttl
@@ -0,0 +1,46 @@
+# Function on object, 1 false reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:   <https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel:   <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+        rr:objectMap [ rml:reference "WrongReference" ] ]
+        ]
+      ]
+    ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0007-CSV/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/mapping.ttl
new file mode 100644
index 00000000..3933a577
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/mapping.ttl
@@ -0,0 +1,46 @@
+# Function on object, 1 template parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno:   <https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel:   <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+        rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+          rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+        rr:objectMap [ rr:template "Name: {Name}" ; rr:termType rr:Literal ] ]
+        ]
+      ]
+    ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/output.ttl
new file mode 100644
index 00000000..5b69f570
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0008-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "NAME: VENUS".
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/mapping.ttl
new file mode 100644
index 00000000..97c3d837
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/mapping.ttl
@@ -0,0 +1,46 @@
+# Function on object returns empty string
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+      rr:predicate foaf:name;
+      rr:objectMap [
+        fnml:functionValue [
+        	rr:predicateObjectMap [
+        		rr:predicate fno:executes ;
+        		rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+        	rr:predicateObjectMap [
+        		rr:predicate grel:valueParameter ;
+        		rr:objectMap [ rr:constant "" ] ]
+        ]
+      ]
+    ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/output.ttl
new file mode 100644
index 00000000..6629e021
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0013-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "" .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/datasource.csv
new file mode 100644
index 00000000..12614593
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/datasource.csv
@@ -0,0 +1,2 @@
+id,name
+0,ben & pieter
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/mapping.ttl
new file mode 100644
index 00000000..2e2c7c07
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/mapping.ttl
@@ -0,0 +1,59 @@
+# Function on object, 1 reference parameter
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix grel: 	<http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{id}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+        rr:predicateObjectMap [
+            rr:predicate fno:executes ;
+            rr:objectMap [ rr:constant grel:escape ] ] ;
+        rr:predicateObjectMap [
+            rr:predicate grel:valueParameter ;
+            rr:objectMap [
+                fnml:functionValue [
+                    rr:predicateObjectMap [
+                        rr:predicate fno:executes ;
+                        rr:objectMap [ rr:constant grel:toUpperCase ] ] ;
+                    rr:predicateObjectMap [
+                        rr:predicate grel:valueParameter ;
+                        rr:objectMap [ rml:reference "name" ] ]
+                ]
+            ] ;
+        ];
+        rr:predicateObjectMap [
+            rr:predicate grel:modeParameter ;
+            rr:objectMap [ rr:constant "html" ] ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/output.ttl
new file mode 100644
index 00000000..2296c1ec
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTC0018-CSV/output.ttl
@@ -0,0 +1 @@
+<http://example.com/0> <http://xmlns.com/foaf/0.1/name> "BEN &amp; PIETER" .
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/mapping.ttl
new file mode 100644
index 00000000..3b95aa81
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/mapping.ttl
@@ -0,0 +1,55 @@
+# test true condition
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap [ rr:constant "true"]
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/output.ttl
new file mode 100644
index 00000000..de68d8c0
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004/output.ttl
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/datasource.csv b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/datasource.csv
new file mode 100644
index 00000000..052b9915
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/datasource.csv
@@ -0,0 +1,2 @@
+Id,Name,Comment,Class
+1,Venus,A&B,A
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/mapping.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/mapping.ttl
new file mode 100644
index 00000000..8fa21bce
--- /dev/null
+++ b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/mapping.ttl
@@ -0,0 +1,55 @@
+# test true condition
+
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix fnml:   <http://semweb.mmlab.be/ns/fnml#> .
+@prefix fno: 	<https://w3id.org/function/ontology#> .
+@prefix grel:     <http://users.ugent.be/~bjdmeest/function/grel.ttl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rmls: <http://semweb.mmlab.be/ns/rmls#> .
+
+@prefix idlab-fn: <http://example.com/idlab/function/> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+              rml:source [
+                 rdf:type rmls:TCPSocketStream ; 
+                 rmls:hostName "localhost" ;
+                 rmls:port "9999"
+              ];
+                  rml:referenceFormulation ql:CSV
+            ];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      fnml:functionValue [
+      	rr:predicateObjectMap [
+      		rr:predicate fno:executes ;
+      		rr:objectMap [ rr:constant idlab-fn:trueCondition ]
+      	];
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:strBoolean ;
+          rr:objectMap [ rr:constant "false"]
+        ] ;
+
+        rr:predicateObjectMap [
+          rr:predicate idlab-fn:str ;
+          rr:objectMap [ rml:reference "Name" ]
+        ]
+      ]
+    ]
+  ].
\ No newline at end of file
diff --git a/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/output.ttl b/src/test/resources/stream/fno-testcases/tcp/RMLFNOTCA004b/output.ttl
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/stream/tcp/RMLTC0000-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0000-CSV-STREAM-TCP/mapping.ttl
index 6c105c11..2900a29c 100644
--- a/src/test/resources/stream/tcp/RMLTC0000-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0000-CSV-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
         
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ] ;
 	
diff --git a/src/test/resources/stream/tcp/RMLTC0000-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0000-JSON-STREAM-TCP/mapping.ttl
index aae32754..6ed17bdf 100644
--- a/src/test/resources/stream/tcp/RMLTC0000-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0000-JSON-STREAM-TCP/mapping.ttl
@@ -14,7 +14,7 @@
   a rr:TriplesMap;
         
   rml:logicalSource [ 
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"       ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ] ;
diff --git a/src/test/resources/stream/tcp/RMLTC0000-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0000-XML-STREAM-TCP/mapping.ttl
index 44db5aa9..988e75a9 100644
--- a/src/test/resources/stream/tcp/RMLTC0000-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0000-XML-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
         
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ] ;
diff --git a/src/test/resources/stream/tcp/RMLTC0001a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0001a-CSV-STREAM-TCP/mapping.ttl
index 9b07bf3a..ecb0eec9 100644
--- a/src/test/resources/stream/tcp/RMLTC0001a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0001a-CSV-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"      ];
     rml:referenceFormulation ql:CSV 
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0001a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0001a-JSON-STREAM-TCP/mapping.ttl
index 1547ae72..982fbe7a 100644
--- a/src/test/resources/stream/tcp/RMLTC0001a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0001a-JSON-STREAM-TCP/mapping.ttl
@@ -14,7 +14,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0001a-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0001a-XML-STREAM-TCP/mapping.ttl
index 8b685a6e..57e12a60 100644
--- a/src/test/resources/stream/tcp/RMLTC0001a-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0001a-XML-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0001b-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0001b-CSV-STREAM-TCP/mapping.ttl
index d16a5de8..f52f3721 100644
--- a/src/test/resources/stream/tcp/RMLTC0001b-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0001b-CSV-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"       ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0001b-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0001b-JSON-STREAM-TCP/mapping.ttl
index 3d76606a..985397a5 100644
--- a/src/test/resources/stream/tcp/RMLTC0001b-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0001b-JSON-STREAM-TCP/mapping.ttl
@@ -14,7 +14,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0001b-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0001b-XML-STREAM-TCP/mapping.ttl
index fada58c1..7467bd71 100644
--- a/src/test/resources/stream/tcp/RMLTC0001b-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0001b-XML-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0002a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002a-CSV-STREAM-TCP/mapping.ttl
index 04b98cea..32589b8a 100644
--- a/src/test/resources/stream/tcp/RMLTC0002a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002a-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"       ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0002a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002a-JSON-STREAM-TCP/mapping.ttl
index 4ef9759c..bcd7cd95 100644
--- a/src/test/resources/stream/tcp/RMLTC0002a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002a-JSON-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-     rml:source [ rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [ rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0002a-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002a-XML-STREAM-TCP/mapping.ttl
index 9aa924d1..b2b3ab44 100644
--- a/src/test/resources/stream/tcp/RMLTC0002a-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002a-XML-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0002b-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002b-CSV-STREAM-TCP/mapping.ttl
index dff5d562..5c654cd3 100644
--- a/src/test/resources/stream/tcp/RMLTC0002b-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002b-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0002b-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002b-JSON-STREAM-TCP/mapping.ttl
index 1da6a9f3..903d90db 100644
--- a/src/test/resources/stream/tcp/RMLTC0002b-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002b-JSON-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0002b-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002b-XML-STREAM-TCP/mapping.ttl
index ccb7b640..72abd6b9 100644
--- a/src/test/resources/stream/tcp/RMLTC0002b-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002b-XML-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0002c-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002c-CSV-STREAM-TCP/mapping.ttl
index ba103d49..4e137ee6 100644
--- a/src/test/resources/stream/tcp/RMLTC0002c-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002c-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0002c-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002c-JSON-STREAM-TCP/mapping.ttl
index acdf252a..d8423a0b 100644
--- a/src/test/resources/stream/tcp/RMLTC0002c-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002c-JSON-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"         ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0002c-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0002c-XML-STREAM-TCP/mapping.ttl
index 686fbfdd..0d575dce 100644
--- a/src/test/resources/stream/tcp/RMLTC0002c-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0002c-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0003c-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0003c-CSV-STREAM-TCP/mapping.ttl
index d9e4bc78..3f6d5671 100644
--- a/src/test/resources/stream/tcp/RMLTC0003c-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0003c-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"       ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0003c-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0003c-JSON-STREAM-TCP/mapping.ttl
index 073897c1..9939f323 100644
--- a/src/test/resources/stream/tcp/RMLTC0003c-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0003c-JSON-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0003c-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0003c-XML-STREAM-TCP/mapping.ttl
index a5711cea..3156f98f 100644
--- a/src/test/resources/stream/tcp/RMLTC0003c-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0003c-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0006a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0006a-CSV-STREAM-TCP/mapping.ttl
index 9e5b7d39..2140f898 100644
--- a/src/test/resources/stream/tcp/RMLTC0006a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0006a-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0006a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0006a-JSON-STREAM-TCP/mapping.ttl
index 594b69ec..65505885 100644
--- a/src/test/resources/stream/tcp/RMLTC0006a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0006a-JSON-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0006a-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0006a-XML-STREAM-TCP/mapping.ttl
index 5c4c6ede..021a2220 100644
--- a/src/test/resources/stream/tcp/RMLTC0006a-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0006a-XML-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007a-CSV-STREAM-TCP/mapping.ttl
index 36f250cf..a6112fed 100644
--- a/src/test/resources/stream/tcp/RMLTC0007a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007a-CSV-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007a-JSON-STREAM-TCP/mapping.ttl
index a91acde5..94181b84 100644
--- a/src/test/resources/stream/tcp/RMLTC0007a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007a-JSON-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007a-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007a-XML-STREAM-TCP/mapping.ttl
index c6cbf84c..338a4510 100644
--- a/src/test/resources/stream/tcp/RMLTC0007a-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007a-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"      ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007b-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007b-CSV-STREAM-TCP/mapping.ttl
index f98f3494..48db2dac 100644
--- a/src/test/resources/stream/tcp/RMLTC0007b-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007b-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007b-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007b-JSON-STREAM-TCP/mapping.ttl
index 4627f4ad..1e70336c 100644
--- a/src/test/resources/stream/tcp/RMLTC0007b-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007b-JSON-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007b-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007b-XML-STREAM-TCP/mapping.ttl
index e133871d..1c5a86b1 100644
--- a/src/test/resources/stream/tcp/RMLTC0007b-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007b-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007c-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007c-CSV-STREAM-TCP/mapping.ttl
index d878613a..b3b042d4 100644
--- a/src/test/resources/stream/tcp/RMLTC0007c-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007c-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007c-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007c-JSON-STREAM-TCP/mapping.ttl
index dba4d312..d8bc4571 100644
--- a/src/test/resources/stream/tcp/RMLTC0007c-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007c-JSON-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007c-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007c-XML-STREAM-TCP/mapping.ttl
index 8557e629..4a65c4d8 100644
--- a/src/test/resources/stream/tcp/RMLTC0007c-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007c-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"       ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007d-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007d-CSV-STREAM-TCP/mapping.ttl
index 79ee95c0..be88c510 100644
--- a/src/test/resources/stream/tcp/RMLTC0007d-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007d-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007d-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007d-JSON-STREAM-TCP/mapping.ttl
index fb477fcb..90ebc349 100644
--- a/src/test/resources/stream/tcp/RMLTC0007d-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007d-JSON-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007d-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007d-XML-STREAM-TCP/mapping.ttl
index 39d17b71..0fc46314 100644
--- a/src/test/resources/stream/tcp/RMLTC0007d-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007d-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007e-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007e-CSV-STREAM-TCP/mapping.ttl
index aba4e8f1..e6cf9592 100644
--- a/src/test/resources/stream/tcp/RMLTC0007e-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007e-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"         ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007e-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007e-JSON-STREAM-TCP/mapping.ttl
index 3e2e4d79..f91d7ddd 100644
--- a/src/test/resources/stream/tcp/RMLTC0007e-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007e-JSON-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007e-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007e-XML-STREAM-TCP/mapping.ttl
index afc0c79f..9878cbbb 100644
--- a/src/test/resources/stream/tcp/RMLTC0007e-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007e-XML-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007f-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007f-CSV-STREAM-TCP/mapping.ttl
index b60d372b..4b4927ec 100644
--- a/src/test/resources/stream/tcp/RMLTC0007f-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007f-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007f-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007f-JSON-STREAM-TCP/mapping.ttl
index d99d0de0..562765e7 100644
--- a/src/test/resources/stream/tcp/RMLTC0007f-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007f-JSON-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007f-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007f-XML-STREAM-TCP/mapping.ttl
index b87c555a..490c6087 100644
--- a/src/test/resources/stream/tcp/RMLTC0007f-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007f-XML-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007g-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007g-CSV-STREAM-TCP/mapping.ttl
index 1be1fa8e..ece0a050 100644
--- a/src/test/resources/stream/tcp/RMLTC0007g-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007g-CSV-STREAM-TCP/mapping.ttl
@@ -10,7 +10,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0007g-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007g-JSON-STREAM-TCP/mapping.ttl
index 7e038a60..f35f3775 100644
--- a/src/test/resources/stream/tcp/RMLTC0007g-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007g-JSON-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0007g-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0007g-XML-STREAM-TCP/mapping.ttl
index 501be889..f948d72f 100644
--- a/src/test/resources/stream/tcp/RMLTC0007g-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0007g-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
 <TriplesMap1> a rr:TriplesMap;
     
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"                 ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0008a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0008a-CSV-STREAM-TCP/mapping.ttl
index de26610a..a3a0c901 100644
--- a/src/test/resources/stream/tcp/RMLTC0008a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0008a-CSV-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0008a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0008a-JSON-STREAM-TCP/mapping.ttl
index 1f779eaa..aaab8e5d 100644
--- a/src/test/resources/stream/tcp/RMLTC0008a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0008a-JSON-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0008a-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0008a-XML-STREAM-TCP/mapping.ttl
index e765b989..d689e710 100644
--- a/src/test/resources/stream/tcp/RMLTC0008a-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0008a-XML-STREAM-TCP/mapping.ttl
@@ -11,7 +11,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0008c-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0008c-CSV-STREAM-TCP/mapping.ttl
index fafa860d..090d848d 100644
--- a/src/test/resources/stream/tcp/RMLTC0008c-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0008c-CSV-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0008c-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0008c-JSON-STREAM-TCP/mapping.ttl
index ad9faf95..5acc424a 100644
--- a/src/test/resources/stream/tcp/RMLTC0008c-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0008c-JSON-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0008c-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0008c-XML-STREAM-TCP/mapping.ttl
index 8c369ae2..2e207ee2 100644
--- a/src/test/resources/stream/tcp/RMLTC0008c-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0008c-XML-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0010a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010a-CSV-STREAM-TCP/mapping.ttl
index a2bcd1da..73a4bfee 100644
--- a/src/test/resources/stream/tcp/RMLTC0010a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010a-CSV-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0010a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010a-JSON-STREAM-TCP/mapping.ttl
index b48095de..d98f93c4 100644
--- a/src/test/resources/stream/tcp/RMLTC0010a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010a-JSON-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
         rml:iterator "$.countries[*]"
 
diff --git a/src/test/resources/stream/tcp/RMLTC0010b-CSV-SPLIT-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010b-CSV-SPLIT-STREAM-TCP/mapping.ttl
index bb9437f6..2635eb31 100644
--- a/src/test/resources/stream/tcp/RMLTC0010b-CSV-SPLIT-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010b-CSV-SPLIT-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0010b-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010b-CSV-STREAM-TCP/mapping.ttl
index 1ec80b32..363f303b 100644
--- a/src/test/resources/stream/tcp/RMLTC0010b-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010b-CSV-STREAM-TCP/mapping.ttl
@@ -13,7 +13,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [ 
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 
diff --git a/src/test/resources/stream/tcp/RMLTC0010b-JSON-SPLIT-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010b-JSON-SPLIT-STREAM-TCP/mapping.ttl
index bbf1493c..0529776e 100644
--- a/src/test/resources/stream/tcp/RMLTC0010b-JSON-SPLIT-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010b-JSON-SPLIT-STREAM-TCP/mapping.ttl
@@ -16,8 +16,7 @@
       rml:source [
                 rdf:type rmls:TCPSocketStream ;
                 rmls:hostName "localhost" ;
-                rmls:port "9999" ;
-                rmls:type "PULL"
+                rmls:port "9999"
             ];
     rml:referenceFormulation ql:JSONPath;
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0010b-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010b-JSON-STREAM-TCP/mapping.ttl
index 37fb26dd..02118236 100644
--- a/src/test/resources/stream/tcp/RMLTC0010b-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010b-JSON-STREAM-TCP/mapping.ttl
@@ -16,8 +16,7 @@
     rml:source [
                     rdf:type rmls:TCPSocketStream ;
                     rmls:hostName "localhost" ;
-                    rmls:port "9999" ;
-                    rmls:type "PULL"
+                    rmls:port "9999"
                 ];
      rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.countries[*]"
diff --git a/src/test/resources/stream/tcp/RMLTC0010b-XML-SPLIT-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010b-XML-SPLIT-STREAM-TCP/mapping.ttl
index 884e1344..2612087f 100644
--- a/src/test/resources/stream/tcp/RMLTC0010b-XML-SPLIT-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010b-XML-SPLIT-STREAM-TCP/mapping.ttl
@@ -16,8 +16,7 @@
       rml:source [
                 rdf:type rmls:TCPSocketStream ;
                 rmls:hostName "localhost" ;
-                rmls:port "9999" ;
-                rmls:type "PULL"
+                rmls:port "9999"
             ];
     rml:referenceFormulation ql:XPath;
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0010b-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0010b-XML-STREAM-TCP/mapping.ttl
index 8ddf88a1..f1a43165 100644
--- a/src/test/resources/stream/tcp/RMLTC0010b-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0010b-XML-STREAM-TCP/mapping.ttl
@@ -17,8 +17,7 @@
     rml:source [
                     rdf:type rmls:TCPSocketStream ;
                     rmls:hostName "localhost" ;
-                    rmls:port "9999" ;
-                    rmls:type "PULL"
+                    rmls:port "9999"
                 ];
         rml:referenceFormulation ql:XPath;
     rml:iterator "/countries/country"
diff --git a/src/test/resources/stream/tcp/RMLTC0012a-CSV-SPLIT-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0012a-CSV-SPLIT-STREAM-TCP/mapping.ttl
index 2bd488ab..da7e9668 100644
--- a/src/test/resources/stream/tcp/RMLTC0012a-CSV-SPLIT-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0012a-CSV-SPLIT-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:CSV
   ];
 	
diff --git a/src/test/resources/stream/tcp/RMLTC0012a-CSV-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0012a-CSV-STREAM-TCP/mapping.ttl
index 2bd488ab..121e3f39 100644
--- a/src/test/resources/stream/tcp/RMLTC0012a-CSV-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0012a-CSV-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+     rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"         ];
     rml:referenceFormulation ql:CSV
   ];
 	
diff --git a/src/test/resources/stream/tcp/RMLTC0012a-JSON-SPLIT-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0012a-JSON-SPLIT-STREAM-TCP/mapping.ttl
index 369d197e..8aacc9ba 100644
--- a/src/test/resources/stream/tcp/RMLTC0012a-JSON-SPLIT-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0012a-JSON-SPLIT-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:JSONPath;
   ];
 	
diff --git a/src/test/resources/stream/tcp/RMLTC0012a-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0012a-JSON-STREAM-TCP/mapping.ttl
index 9c6ad611..254dc7f7 100644
--- a/src/test/resources/stream/tcp/RMLTC0012a-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0012a-JSON-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"         ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.persons[*]"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC0012a-XML-SPLIT-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0012a-XML-SPLIT-STREAM-TCP/mapping.ttl
index c927b794..e493ab74 100644
--- a/src/test/resources/stream/tcp/RMLTC0012a-XML-SPLIT-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0012a-XML-SPLIT-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+    rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
     rml:referenceFormulation ql:XPath;
   ];
 	
diff --git a/src/test/resources/stream/tcp/RMLTC0012a-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC0012a-XML-STREAM-TCP/mapping.ttl
index 226e82c3..6611f37e 100644
--- a/src/test/resources/stream/tcp/RMLTC0012a-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC0012a-XML-STREAM-TCP/mapping.ttl
@@ -12,7 +12,7 @@
   a rr:TriplesMap;
 
   rml:logicalSource [
-   rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999" ;            rmls:type "PULL"        ];
+   rml:source [            rdf:type rmls:TCPSocketStream ;            rmls:hostName "localhost" ;            rmls:port "9999"        ];
        rml:referenceFormulation ql:XPath;
     rml:iterator "/Persons/Person"
   ];
diff --git a/src/test/resources/stream/tcp/RMLTC1001-JSON-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC1001-JSON-STREAM-TCP/mapping.ttl
index bced3792..c4d3b004 100644
--- a/src/test/resources/stream/tcp/RMLTC1001-JSON-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC1001-JSON-STREAM-TCP/mapping.ttl
@@ -15,8 +15,7 @@
       rml:source [
                 rdf:type rmls:TCPSocketStream ;
                 rmls:hostName "localhost" ;
-                rmls:port "9999" ;
-                rmls:type "PULL"
+                rmls:port "9999"
             ];
     rml:referenceFormulation ql:JSONPath;
     rml:iterator "$.students[*]"
diff --git a/src/test/resources/stream/tcp/RMLTC1001-XML-STREAM-TCP/mapping.ttl b/src/test/resources/stream/tcp/RMLTC1001-XML-STREAM-TCP/mapping.ttl
index b9f76f28..f1a01a12 100644
--- a/src/test/resources/stream/tcp/RMLTC1001-XML-STREAM-TCP/mapping.ttl
+++ b/src/test/resources/stream/tcp/RMLTC1001-XML-STREAM-TCP/mapping.ttl
@@ -15,8 +15,7 @@
     rml:source [
                 rdf:type rmls:TCPSocketStream ;
                 rmls:hostName "localhost" ;
-                rmls:port "9999" ;
-                rmls:type "PULL"
+                rmls:port "9999"
             ];
     rml:referenceFormulation ql:XPath;
     rml:iterator "/students/student"
diff --git a/src/test/scala/io/rml/framework/FunctionMappingTest.scala b/src/test/scala/io/rml/framework/FunctionMappingTest.scala
new file mode 100644
index 00000000..6d316eaa
--- /dev/null
+++ b/src/test/scala/io/rml/framework/FunctionMappingTest.scala
@@ -0,0 +1,24 @@
+package io.rml.framework
+
+import io.rml.framework.api.FnOEnvironment
+import io.rml.framework.core.internal.Logging
+import org.scalatest.{BeforeAndAfterAll, FunSuite}
+
+object FunctionMappingSetup {
+  def setupFunctionLoader() = {
+    // singleton FunctionLoader created and initialized with default function descriptions and function mappings
+    FnOEnvironment.loadDefaultConfiguration()
+    FnOEnvironment.intializeFunctionLoader()
+  }
+}
+
+/**
+ * Test helper trait that automatically initializes the function loader with the default configuration.
+ */
+trait FunctionMappingTest extends FunSuite  with BeforeAndAfterAll with Logging{
+  
+  override protected def beforeAll(): Unit = {
+    logInfo("Before All")
+    FunctionMappingSetup.setupFunctionLoader()
+  }
+}
\ No newline at end of file
diff --git a/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala b/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala
new file mode 100644
index 00000000..e4421b8a
--- /dev/null
+++ b/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala
@@ -0,0 +1,177 @@
+/**
+  * MIT License
+  *
+  * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a copy
+  * of this software and associated documentation files (the "Software"), to deal
+  * in the Software without restriction, including without limitation the rights
+  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  * copies of the Software, and to permit persons to whom the Software is
+  * furnished to do so, subject to the following conditions:
+  *
+  * The above copyright notice and this permission notice shall be included in
+  * all copies or substantial portions of the Software.
+  *
+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  * THE SOFTWARE.
+  *
+  **/
+package io.rml.framework
+
+import io.rml.framework.util.server.TestData
+import kafka.server.{KafkaConfig, KafkaServerStartable}
+import org.apache.curator.test.TestingServer
+import org.apache.kafka.clients.admin.AdminClient
+import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord}
+
+import java.io.File
+import java.util.Properties
+import scala.concurrent.ExecutionContextExecutor
+
+class KafkaStreamTestSyncFnO extends StreamTestSync{
+  // initialise zookeeper, but do not start yet.
+  var zookeeper: TestingServer = _
+  var kafka: KafkaServerStartable = _
+  var admin: AdminClient = _
+  var client:  KafkaProducer[String, String] = _
+
+
+  override def testFolder: String = "stream/fno-testcases/kafka"
+
+  override def passingTests: Array[(String, String)] = Array(
+    (testFolder, "noopt")
+
+  )
+
+  override def setup(): Unit = {
+    super.setup()
+    logInfo("Setting up FunctionLoader")
+    FunctionMappingSetup.setupFunctionLoader()
+    logInfo("Starting Zookeeper...")
+    zookeeper = new TestingServer(
+      getZkPort,
+      new File(getTempDir, "kafkazookeeper")
+    )
+    logInfo("Zookeeper started.")
+
+    logInfo("Starting Kafka...")
+    val config = new KafkaConfig(serverProperties)
+    kafka = new KafkaServerStartable(config)
+    kafka.startup()
+    logInfo("Kafka started.")
+
+    logInfo("Creating Kafka admin client...")
+    admin = AdminClient.create(serverProperties)
+    logInfo("Kafka admin client created.")
+
+    logInfo("Creating Kafka client...")
+    client = new KafkaProducer[String, String](producerProps)
+    logInfo("Creating Kafka client created.")
+  }
+
+
+  override def beforeTestCase(): Unit = {
+    // topics seem to be created automatically...
+
+    /*logInfo("Creating Kafka input topic...")
+    val topicName = "demo"
+    val numPartitions = 1
+    val replicationFactor = 1
+    val topic = new NewTopic(topicName, numPartitions, replicationFactor.toShort)
+    val createTopicsResult = admin.createTopics(ArrayBuffer(topic).asJava)
+    createTopicsResult.all().get()  // wait for completion of creating topics
+    Thread.sleep(2000)
+    logInfo("Creating Kafka input topic done.") */
+  }
+
+  override def afterTestCase(): Unit = {
+    logInfo("Deleting Kafka input topic(s)...")
+    val topics = admin.listTopics().names().get()
+    val deleteResults = admin.deleteTopics(topics)
+    deleteResults.all().get()
+    Thread.sleep(2000)  // wait a bit for the topic to be *really* deleted!
+    logInfo("Kafka input topic(s) deleted.")
+  }
+
+  override def teardown(): Unit = {
+    logInfo("Stopping Kafka admin client...")
+    if (admin != null) {
+      admin.close()
+    }
+    logInfo("Kafka admin client stopped.")
+
+    logInfo("Shutting down Kafka...")
+    if (kafka != null) {
+      kafka.shutdown()
+      kafka.awaitShutdown()
+    }
+    logInfo("Kafka stopped.")
+
+    logInfo("Shutting down Zookeeper")
+    if (zookeeper != null) {
+      zookeeper.close()
+    }
+    logInfo("Zookeeper stopped.")
+  }
+
+
+  override def writeData(input: List[TestData])(implicit executur: ExecutionContextExecutor): Unit = {
+    for (batch <- input) {
+
+      val topic = if (input.size > 1)
+        batch.filename.replaceAll("\\..*", "")
+      else
+        "demo"
+
+      for (in <- batch.data) {
+        logInfo(s"Writing record to Kafka: [${in}]")
+        val result = client.send(new ProducerRecord[String, String](topic, in))
+        result.get()  // wait until data is sent.
+      }
+    }
+  }
+
+  /////////////////////////
+  // some helper methods //
+  /////////////////////////
+  private def serverProperties: Properties = {
+    val props = new Properties()
+    props.put("zookeeper.connect", "localhost:2181")
+    props.put("bootstrap.servers", "localhost:9092")
+    props.put("broker.id", "1")
+    props.put("port", "9092")
+    props.put("log.dir", new File(getTempDir, "kafka").getAbsolutePath)
+    props.put("host.name", "localhost")
+    props.put("delete.topic.enable", "true")
+    props.put("offsets.topic.replication.factor", "1")  // by default it will expect 3
+    props.put("offsets.topic.num.partitions", "1")  // by default it will expect 3
+    props
+  }
+
+  private def producerProps: Properties = {
+    val props = new Properties()
+    props.put("bootstrap.servers", "localhost:9092")
+    props.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer")
+    props.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer")
+    props.put("acks", "1")
+    props
+  }
+
+  private def getZkPort: Int = {
+    val inetAddress = serverProperties.getProperty("zookeeper.connect")
+    if (inetAddress == null || inetAddress.isEmpty || !inetAddress.contains(":")) {
+      throw new IllegalArgumentException("The given connection address in string is invalid.")
+    }
+    inetAddress.split(":")(1).toInt
+  }
+}
+
+object KafkaStreamTestSyncFnO {
+
+}
diff --git a/src/test/scala/io/rml/framework/OutputGenerationTest.scala b/src/test/scala/io/rml/framework/OutputGenerationTest.scala
index a4f544e1..292bc2ee 100644
--- a/src/test/scala/io/rml/framework/OutputGenerationTest.scala
+++ b/src/test/scala/io/rml/framework/OutputGenerationTest.scala
@@ -25,41 +25,79 @@
 package io.rml.framework
 
 import io.rml.framework.api.RMLEnvironment
-import io.rml.framework.engine.PostProcessor
+import io.rml.framework.engine.{NopPostProcessor, PostProcessor}
 import io.rml.framework.util.TestUtil
 import io.rml.framework.util.fileprocessing.{ExpectedOutputTestUtil, TripleGeneratorTestUtil}
 import io.rml.framework.util.logging.Logger
+import org.scalatest.BeforeAndAfter
 
 import scala.util.control.Exception
 
 
-class OutputGenerationTest extends StaticTestSpec with ReadMappingBehaviour {
+class OutputGenerationTest extends StaticTestSpec with ReadMappingBehaviour with BeforeAndAfter {
 
-  val failing = Array( "negative_test_cases")
-  val passing = Array(
+  before {
+    FunctionMappingSetup.setupFunctionLoader()
+  }
+
+
+  // dev note:
+  // Explicit type annotation allows to completely comment out the elements of the failing, passing or temp arrays
+  //  without causing compilation failures.
+  //  This is useful, for example, if you only want to check the tests that should pass.
+
+  val invalidMappingFile : Array[String] = Array(
+    "rml-testcases-invalid-mapping-file"
+  )
+  val passing : Array[Tuple2[String,String]] =Array(
     ("bugs","noopt"),
-    ("rml-testcases","noopt"))
-  val temp = Array(("rml-testcases/temp","noopt") )
+    ("rml-testcases","noopt"),
+    ("fno-testcases", "noopt")
+  )
 
+  val negative : Array[String] = Array(
+    "rml-testcases-negative"
+  )
 
-  "Valid mapping file" should behave like validMappingFile("rml-testcases")
+  val temp : Array[Tuple2[String,String]] = Array(
+    ("rml-testcases/temp","noopt")
+  )
 
-  "Valid mapping output generation" should "match the output from output.ttl" in {
+  ///////////////////////
+  // passing test cases
+  ///////////////////////
+
+  passing.foreach { test =>
+    test._1 should behave like validMappingFile(test._1)
+  }
 
+  "Valid mapping output generation" should "match the output from output.ttl" in {
     passing.foreach(test =>  {
       RMLEnvironment.setGeneratorBaseIRI(Some("http://example.com/base/"))
       implicit val postProcessor: PostProcessor= TestUtil.pickPostProcessor(test._2)
-      ExpectedOutputTestUtil.test(test._1, checkGeneratedOutput)
+      ExpectedOutputTestUtil.test(test._1, true, checkGeneratedOutput)
     })
-    //checkGeneratedOutput(OutputTestHelper.getFile("example2-object").toString)
   }
 
-  failing foreach  {
-    el  =>
+  ////////////////////////////////////////////
+  // test cases where mapping file is invalid
+  ////////////////////////////////////////////
 
+  invalidMappingFile foreach  {
+    el  =>
       s"Reading invalid mapping files in $el" should behave like invalidMappingFile(el)
   }
 
+  ////////////////////////////////////////////////////////////////////
+  // negative test cases: valid mapping but something else goes wrong
+  ////////////////////////////////////////////////////////////////////
+
+  negative.foreach { test =>
+    test should behave like validMappingFile(test)
+    RMLEnvironment.setGeneratorBaseIRI(Some("http://example.com/base/"))
+    implicit val postProcessor: PostProcessor= new NopPostProcessor
+    ExpectedOutputTestUtil.test(test, false, checkGeneratedOutput)
+  }
 
   /**
     * Check for thrown TermTypeException when reading invalid term typed subjects.
@@ -73,6 +111,7 @@ class OutputGenerationTest extends StaticTestSpec with ReadMappingBehaviour {
     val eitherGenerated = catcher.either(TripleGeneratorTestUtil.processFilesInTestFolder(testFolderPath))
 
 
+
     if (eitherGenerated.isRight & testFolderPath.contains("RMLTC")) {
       val (generatedOutput, format) = eitherGenerated.right.get.head
       Logger.logInfo(testFolderPath)
@@ -89,17 +128,34 @@ class OutputGenerationTest extends StaticTestSpec with ReadMappingBehaviour {
     *
     * @param testFolderPath
     */
-  def checkGeneratedOutput(testFolderPath: String)(implicit postProcessor: PostProcessor): Unit = {
+  def checkGeneratedOutput(testFolderPath: String, shouldPass: Boolean)(implicit postProcessor: PostProcessor): Unit = {
+    Logger.logInfo("checkGeneratedOutput(%s)".format(testFolderPath))
     val (expectedOutput, expectedOutputFormat) = ExpectedOutputTestUtil.processFilesInTestFolder(testFolderPath).head
     val tester = TripleGeneratorTestUtil(postProcessor)
-    var (generatedOutput, generatedOutputFormat) = tester.processFilesInTestFolder(testFolderPath).head
-    val outcome = TestUtil.compareResults(testFolderPath, generatedOutput, expectedOutput, generatedOutputFormat, expectedOutputFormat)
-    outcome match {
-      case Left(e) => {
-        fail(e)
-        System.exit(1)
+    try {
+      var (generatedOutput, generatedOutputFormat) = tester.processFilesInTestFolder(testFolderPath).head
+      val outcome = TestUtil.compareResults(testFolderPath, generatedOutput, expectedOutput, generatedOutputFormat, expectedOutputFormat)
+      outcome match {
+        case Left(e) => {
+          if (shouldPass) {
+            fail(e)
+            System.exit(1)
+          }
+        }
+        case Right(e) => {
+          if (!shouldPass) {
+            fail(e)
+            System.exit(1)
+          }
+        }
+      }
+    } catch {
+      case e => {
+        if (shouldPass) {
+          fail(e);
+          System.exit(1)
+        }
       }
-      case Right(e) => // just go on :)
     }
   }
 
diff --git a/src/test/scala/io/rml/framework/SandboxTests.scala b/src/test/scala/io/rml/framework/SandboxTests.scala
new file mode 100644
index 00000000..1628b94a
--- /dev/null
+++ b/src/test/scala/io/rml/framework/SandboxTests.scala
@@ -0,0 +1,144 @@
+/**
+ * MIT License
+ *
+ * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **/
+package io.rml.framework
+
+import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.extractors.TriplesMapsCache
+import io.rml.framework.core.util.Util
+import io.rml.framework.engine.NopPostProcessor
+import io.rml.framework.util.TestUtil
+import io.rml.framework.util.logging.Logger
+import org.apache.flink.api.scala.ExecutionEnvironment
+import org.apache.flink.streaming.api.scala._
+import org.scalatest.{FunSuite, Matchers}
+
+import java.io.File
+
+
+class SandboxTests extends FunSuite with Matchers  with FunctionMappingTest {
+
+
+  private def executeTest(mappingFile: String): Unit = {
+    TriplesMapsCache.clear();
+    RMLEnvironment.setGeneratorBaseIRI(Some("http://example.org/base/"))
+    implicit val env = ExecutionEnvironment.getExecutionEnvironment
+    implicit val senv = StreamExecutionEnvironment.getExecutionEnvironment
+    implicit val postProcessor = new NopPostProcessor()
+
+    val testDir = Util.getFile(new File(mappingFile).getParent)
+    val mappingFileAbs = new File(testDir, new File(mappingFile).getName)
+
+    // read the mapping
+    val formattedMapping = Util.readMappingFile(mappingFileAbs.getAbsolutePath)
+
+    // execute
+    val result = Main.createDataSetFromFormattedMapping(formattedMapping).collect()
+
+    // get expected output
+    //val testDir = new File(mappingFile).getParentFile.getAbsoluteFile
+    val (expectedOutput, expectedOutputFormat) = TestUtil.getExpectedOutputs(testDir)
+
+
+    val testOutcome = TestUtil.compareResults(s"SandboxTests: ${testDir}", result, expectedOutput, postProcessor.outputFormat, expectedOutputFormat)
+
+    testOutcome match {
+      case Left(e) => {
+        Logger.logError(e)
+        System.exit(1)
+        fail(e)
+      }
+      case Right(e) => {
+        Logger.logSuccess(e)
+      }
+    }
+  }
+
+
+  test("sandbox/function_related/equal") {
+    executeTest("sandbox/function_related/equal/mapping.ttl")
+  }
+
+  test("sandbox/function_related/notEqual") {
+    executeTest("sandbox/function_related/notEqual/mapping.ttl")
+  }
+
+  test("sandbox/function_related/contains") {
+    executeTest("sandbox/function_related/contains/mapping.ttl")
+  }
+
+  test("sandbox/function_related/using_trueCondition_and_equal") {
+    executeTest("sandbox/function_related/using_trueCondition_and_equal/mapping.ttl")
+  }
+
+
+  test("sandbox/function_related/using_trueCondition_and_contains") {
+    executeTest("sandbox/function_related/using_trueCondition_and_contains/mapping.ttl")
+  }
+
+  test("sandbox/function_related/controls_if_true") {
+    executeTest("sandbox/function_related/controls_if_true/mapping.ttl")
+  }
+
+  test("sandbox/function_related/controls_if_false") {
+    executeTest("sandbox/function_related/controls_if_false/mapping.ttl")
+  }
+
+  test("sandbox/function_related/controls_if_contains") {
+    executeTest("sandbox/function_related/controls_if_contains/mapping.ttl")
+  }
+
+  test("sandbox/function_related/controls_if_contains_true_execute_triplesmap") {
+    pending
+    executeTest("sandbox/function_related/controls_if_contains_true_execute_triplesmap/mapping.ttl")
+  }
+
+  test("sandbox/function_related/condition-on-po") {
+    executeTest("sandbox/function_related/condition-on-po/mapping.rml.ttl")
+  }
+
+  test("sandbox/function_related/condition-function-on-po") {
+    executeTest("sandbox/function_related/condition-function-on-po/mapping.ttl")
+  }
+
+  test("sandbox/function_related/condition-on-mapping-subject-function") {
+    executeTest("sandbox/function_related/condition-on-mapping-subject-function/mapping.ttl")
+  }
+
+
+  test("failing/fno-testcases/RMLFNOTC0023-CSV") {
+    pending
+    executeTest("failing/fno-testcases/RMLFNOTC0023-CSV/mapping.ttl")
+  }
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/src/test/scala/io/rml/framework/StreamTestSync.scala b/src/test/scala/io/rml/framework/StreamTestSync.scala
index 81b95bd9..23bc5e19 100644
--- a/src/test/scala/io/rml/framework/StreamTestSync.scala
+++ b/src/test/scala/io/rml/framework/StreamTestSync.scala
@@ -24,11 +24,8 @@
   **/
 package io.rml.framework
 
-import java.io.File
-import java.nio.file.{Path, Paths}
-import java.util.concurrent.Executors
-
 import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.extractors.TriplesMapsCache
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.util.{StreamerConfig, Util}
 import io.rml.framework.engine.PostProcessor
@@ -43,6 +40,9 @@ import org.apache.flink.runtime.jobgraph.JobGraph
 import org.apache.flink.runtime.minicluster.{MiniCluster, MiniClusterConfiguration}
 import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
 
+import java.io.File
+import java.nio.file.{Path, Paths}
+import java.util.concurrent.Executors
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutor}
 import scala.reflect.io.Directory
 
@@ -104,6 +104,7 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
 
   // run the test cases
   for ((folderPath, postProcessorName) <- testCases) {
+    TriplesMapsCache.clear();
 
     //it should s"produce triples equal to the expected triples for ${folderPath.getFileName}" in {
     Logger.lineBreak(50)
@@ -115,7 +116,8 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
 
     // set up the execution environments
     implicit val env: ExecutionEnvironment = ExecutionEnvironment.getExecutionEnvironment
-    implicit val senv: StreamExecutionEnvironment = StreamExecutionEnvironment.getExecutionEnvironment
+    implicit val senv: StreamExecutionEnvironment = StreamExecutionEnvironment.createLocalEnvironmentWithWebUI()
+
     implicit val executor: ExecutionContextExecutor = ExecutionContext.fromExecutor(Executors.newCachedThreadPool())
 
     // create data stream and sink
@@ -200,6 +202,7 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
     val customConfig = new Configuration()
     customConfig.setString("io.tmp.dirs", getTempDir.getAbsolutePath)
     customConfig.setString("rest.bind-port", "50000-51000") // see https://github.com/apache/flink/commit/730eed71ef3f718d61f85d5e94b1060844ca56db
+
     val configuration = new MiniClusterConfiguration.Builder()
       .setConfiguration(customConfig)
       .setNumTaskManagers(1)
diff --git a/src/test/scala/io/rml/framework/TCPStreamTestSyncFnO.scala b/src/test/scala/io/rml/framework/TCPStreamTestSyncFnO.scala
new file mode 100644
index 00000000..7e175420
--- /dev/null
+++ b/src/test/scala/io/rml/framework/TCPStreamTestSyncFnO.scala
@@ -0,0 +1,155 @@
+/**
+  * MIT License
+  *
+  * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a copy
+  * of this software and associated documentation files (the "Software"), to deal
+  * in the Software without restriction, including without limitation the rights
+  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  * copies of the Software, and to permit persons to whom the Software is
+  * furnished to do so, subject to the following conditions:
+  *
+  * The above copyright notice and this permission notice shall be included in
+  * all copies or substantial portions of the Software.
+  *
+  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  * THE SOFTWARE.
+  *
+  **/
+package io.rml.framework
+
+import io.netty.bootstrap.ServerBootstrap
+import io.netty.buffer.ByteBuf
+import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.socket.SocketChannel
+import io.netty.channel.socket.nio.NioServerSocketChannel
+import io.netty.channel.{ChannelFuture, ChannelHandlerContext, ChannelInboundHandlerAdapter, ChannelInitializer}
+import io.netty.util.{CharsetUtil, ReferenceCountUtil}
+import io.rml.framework.util.logging.Logger
+import io.rml.framework.util.server.TestData
+
+import java.net.InetSocketAddress
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.TimeUnit
+import scala.concurrent.{ExecutionContextExecutor, Future, Promise}
+
+class TCPStreamTestSyncFnO extends StreamTestSync {
+  var serverChannel: ChannelFuture = _
+  var group: NioEventLoopGroup = _
+  var lock: AnyRef with Specializable = _
+  var promiseChContext: Promise[ChannelHandlerContext] = _
+
+  override def testFolder: String = "stream/fno-testcases/tcp"
+
+  override def passingTests: Array[(String, String)] = Array(
+    ("stream/fno-testcases/tcp", "noopt")
+  )
+
+
+  override def setup(): Unit = {
+    super.setup()
+    FunctionMappingSetup.setupFunctionLoader()
+    lock = AnyRef
+    promiseChContext = Promise[ChannelHandlerContext]()
+    logInfo("Setting up event loop group...")
+    group = new NioEventLoopGroup()
+    logInfo("Setting up event loop group done.")
+    logInfo("Setting up server bootstrap")
+    val serverBootstrap = new ServerBootstrap()
+    serverBootstrap.group(group)
+    serverBootstrap.channel(classOf[NioServerSocketChannel])
+    serverBootstrap.localAddress(new InetSocketAddress("localhost", 9999))
+    serverBootstrap.childHandler(new ChannelInitializer[SocketChannel]() {
+      override protected def initChannel(socketChannel: SocketChannel): Unit = {
+        socketChannel.pipeline.addLast(
+          new TCPServerHandler(Iterator.empty))
+      }
+    })
+
+    serverChannel = serverBootstrap.bind.sync
+
+  }
+
+  override def beforeTestCase(): Unit = {}
+
+  override def afterTestCase(): Unit = {}
+
+  override def teardown(): Unit = {
+    Logger.logInfo("Stopping TCP server")
+    if (serverChannel != null) {
+      serverChannel.channel().closeFuture().await(10, TimeUnit.SECONDS)
+    }
+    if (group != null) {
+      group.shutdownGracefully(2, 10, TimeUnit.SECONDS).await()
+    }
+    Logger.logInfo("TCP server stopped.")
+  }
+
+  override def writeData(input: List[TestData])(implicit executor: ExecutionContextExecutor): Unit = {
+    getChCtxFuture map { ctx =>
+      Logger.logInfo(ctx.channel().toString)
+      for (batch <- input) {
+        for (el <- batch.data) {
+          el.split("\n").foreach(Logger.logInfo)
+          val bytesToSend = el.getBytes(StandardCharsets.UTF_8)
+          val byteBuff = ctx.alloc.buffer(bytesToSend.length)
+          byteBuff.writeBytes(bytesToSend)
+          ctx.channel.writeAndFlush(byteBuff).await()
+        }
+      }
+    }
+  }
+
+
+  def getChCtxFuture: Future[ChannelHandlerContext] = lock.synchronized {
+    promiseChContext.future
+  }
+
+
+  class TCPServerHandler(messages: Iterator[String]) extends ChannelInboundHandlerAdapter {
+    @throws[Exception]
+    override def channelRead(ctx: ChannelHandlerContext, msge: Any): Unit = {
+      val inBuffer = msge.asInstanceOf[ByteBuf]
+      val received = inBuffer.toString(CharsetUtil.UTF_8)
+      ReferenceCountUtil.release(msge)
+
+      Logger.logInfo("TCPServer received: " + received)
+
+    }
+
+
+    @throws[Exception]
+    override def channelReadComplete(ctx: ChannelHandlerContext): Unit = {
+      ctx.flush()
+    }
+
+    override def channelActive(ctx: ChannelHandlerContext): Unit = {
+      lock.synchronized {
+
+
+        if (promiseChContext.isCompleted) {
+          promiseChContext = Promise[ChannelHandlerContext]()
+        }
+        promiseChContext success ctx
+
+        messages.foreach(msg => {
+          val byteBufMsg = ctx.alloc.buffer(msg.length)
+          byteBufMsg.writeBytes(msg.getBytes)
+          ctx.channel.writeAndFlush(byteBufMsg)
+        })
+      }
+    }
+
+    @throws[Exception]
+    override def exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable): Unit = {
+      Logger.logError("Error while using TCP server: ", cause)
+      ctx.close
+    }
+  }
+}
diff --git a/src/test/scala/io/rml/framework/Test.scala b/src/test/scala/io/rml/framework/Test.scala
deleted file mode 100644
index 64dafa8b..00000000
--- a/src/test/scala/io/rml/framework/Test.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-  * MIT License
-  *
-  * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
-  *
-  * Permission is hereby granted, free of charge, to any person obtaining a copy
-  * of this software and associated documentation files (the "Software"), to deal
-  * in the Software without restriction, including without limitation the rights
-  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  * copies of the Software, and to permit persons to whom the Software is
-  * furnished to do so, subject to the following conditions:
-  *
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  *
-  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  * THE SOFTWARE.
-  *
-  **/
-package io.rml.framework
-
-import java.io.File
-
-import io.rml.framework.core.extractors.MappingReader
-import io.rml.framework.core.model.FormattedRMLMapping
-import io.rml.framework.engine.NopPostProcessor
-import io.rml.framework.util.logging.Logger
-import org.apache.flink.api.scala.ExecutionEnvironment
-import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
-
-object Test extends App {
-
-  implicit val env = ExecutionEnvironment.getExecutionEnvironment
-  implicit val senv = StreamExecutionEnvironment.getExecutionEnvironment
-  implicit val postProcessor = new NopPostProcessor()
-  val classLoader = getClass.getClassLoader
-  val file = new File(classLoader.getResource("rml-testcases/RMLTC0007d-CSV/mapping.ttl").getFile)
-  val mapping = MappingReader().read(file)
-
-  val formattedMapping = FormattedRMLMapping.fromRMLMapping(mapping)
-  Logger.logInfo("" + formattedMapping.standardStaticTriplesMaps.size)
-  val result = Main.createDataSetFromFormattedMapping(formattedMapping).collect().reduce((a, b) => a + "\n" + b)
-  System.out.println(result)
-}
diff --git a/src/test/scala/io/rml/framework/engine/StatementEngineTest.scala b/src/test/scala/io/rml/framework/engine/StatementEngineTest.scala
index 91ac40b6..0a6c7431 100644
--- a/src/test/scala/io/rml/framework/engine/StatementEngineTest.scala
+++ b/src/test/scala/io/rml/framework/engine/StatementEngineTest.scala
@@ -24,10 +24,9 @@
   **/
 package io.rml.framework.engine
 
-import java.io.File
-
 import io.rml.framework.Main
 import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.extractors.TriplesMapsCache
 import io.rml.framework.core.util.Util
 import io.rml.framework.util.TestUtil
 import io.rml.framework.util.logging.Logger
@@ -35,9 +34,12 @@ import org.apache.flink.api.scala.ExecutionEnvironment
 import org.apache.flink.streaming.api.scala._
 import org.scalatest.{FunSuite, Matchers}
 
+import java.io.File
+
 class StatementEngineTest extends FunSuite with Matchers {
 
   private def executeTest(mappingFile: String): Unit = {
+    TriplesMapsCache.clear();
     RMLEnvironment.setGeneratorBaseIRI(Some("http://example.org/base/"))
     implicit val env = ExecutionEnvironment.getExecutionEnvironment
     implicit val senv = StreamExecutionEnvironment.getExecutionEnvironment
@@ -70,7 +72,12 @@ class StatementEngineTest extends FunSuite with Matchers {
   }
 
 
+  /** [STATE @ vr 29 mei 2020 13:24:55 CEST] FAILING
+   * java -jar ~/Github/RML/rmlmapper.jar -m example10/mapping.ttl                                                                                                                                 ✔  10090  13:24:14
+   * 13:24:26.959 [main] ERROR be.ugent.rml.cli.Main               .main(315) - Expected ':', found '/' [line 1]
+   */
   test("example10") {
+    pending
     executeTest("example10/mapping.rml.ttl")
   }
 
@@ -116,6 +123,7 @@ class StatementEngineTest extends FunSuite with Matchers {
   }
 
   test("example8") {
+    pending // TODO: while an empty value should produce triples, the *function* applied on them doen't filter them out. Check if function is correct.
     executeTest("example8/simergy.rml.ttl")
   }
 
diff --git a/src/test/scala/io/rml/framework/model/function/FunctionLoaderTest.scala b/src/test/scala/io/rml/framework/model/function/FunctionLoaderTest.scala
new file mode 100644
index 00000000..f99094f8
--- /dev/null
+++ b/src/test/scala/io/rml/framework/model/function/FunctionLoaderTest.scala
@@ -0,0 +1,12 @@
+package io.rml.framework.model.function
+
+import io.rml.framework.StaticTestSpec
+import org.scalatest.DoNotDiscover
+
+@DoNotDiscover
+class FunctionLoaderTest extends StaticTestSpec {
+
+
+
+
+}
diff --git a/src/test/scala/io/rml/framework/std/StdMappingReaderTest.scala b/src/test/scala/io/rml/framework/std/StdMappingReaderTest.scala
index 009267dc..15d98f5c 100644
--- a/src/test/scala/io/rml/framework/std/StdMappingReaderTest.scala
+++ b/src/test/scala/io/rml/framework/std/StdMappingReaderTest.scala
@@ -25,7 +25,10 @@
 
 package io.rml.framework.std
 
+import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.extractors.TriplesMapsCache
 import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.util.Util
 import org.scalatest.{BeforeAndAfter, FunSuite, Matchers}
 import org.scalatestplus.mockito.MockitoSugar
 
@@ -34,6 +37,60 @@ class StdMappingReaderTest extends FunSuite with Matchers
                                             with BeforeAndAfter
                                             with Logging {
 
+  // TODO: There are no assetions in the tests??
+
+  after {
+    // clean up
+    RMLEnvironment.setMappingFileBaseIRI(None)
+  }
+  /**
+   * ├── scenario01
+   * │   ├── RMLTC0001a-CSV
+   * │   │   ├── mapping.ttl        // rml:source "../student.csv";
+   * │   │   └── output.ttl
+   * │   └── student.csv
+   */
+  test("relative paths: scenario01"){
+    TriplesMapsCache.clear();
+    val mappingFile = "relative_paths/scenario01/RMLTC0001a-CSV/mapping.ttl"
+    // determine the base IRI of the mapping file
+    RMLEnvironment.setMappingFileBaseIRI(Some((mappingFile)))
+    val formattedMapping = Util.readMappingFile(mappingFile)
+  }
+
+  /**
+   * ├── scenario02
+   * │   ├── RMLTC0001a-CSV
+   * │   │   ├── mapping.ttl      // rml:source "../data/student.csv";
+   * │   │   └── output.ttl
+   * │   └── data
+   * │       └── student.csv
+   */
+  test("relative paths: scenario02"){
+    TriplesMapsCache.clear();
+    val mappingFile = "relative_paths/scenario02/RMLTC0001a-CSV/mapping.ttl"
+    // determine the base IRI of the mapping file
+    RMLEnvironment.setMappingFileBaseIRI(Some((mappingFile)))
+    val formattedMapping = Util.readMappingFile(mappingFile)
+  }
+
+  /**
+   * └── scenario03
+   *     └── RMLTC0001a-CSV
+   *         ├── data
+   *         │   └── student.csv
+   *         ├── mapping.ttl    // rml:source "data/student.csv";
+   *         └── output.ttl
+   */
+  test("relative paths: scenario03"){
+    TriplesMapsCache.clear();
+    val mappingFile = "relative_paths/scenario03/RMLTC0001a-CSV/mapping.ttl"
+    // determine the base IRI of the mapping file
+    RMLEnvironment.setMappingFileBaseIRI(Some((mappingFile)))
+    val formattedMapping = Util.readMappingFile(mappingFile)
+  }
+
+
 /**
   test("testReadFromFile") {
 
diff --git a/src/test/scala/io/rml/framework/util/CommentFilter.scala b/src/test/scala/io/rml/framework/util/CommentFilter.scala
index 5871043c..212d5e0a 100644
--- a/src/test/scala/io/rml/framework/util/CommentFilter.scala
+++ b/src/test/scala/io/rml/framework/util/CommentFilter.scala
@@ -28,6 +28,6 @@ class CommentFilter extends Filter[String] {
   val filterChars = Set('#')
 
   override def check(line: String): Boolean = {
-      line.trim.length > 0 &&  !filterChars.contains(line.trim.charAt(0))
+      line.trim.nonEmpty &&  !filterChars.contains(line.trim.charAt(0))
   }
 }
diff --git a/src/test/scala/io/rml/framework/util/TestUtil.scala b/src/test/scala/io/rml/framework/util/TestUtil.scala
index 1d24b1be..e69819ed 100644
--- a/src/test/scala/io/rml/framework/util/TestUtil.scala
+++ b/src/test/scala/io/rml/framework/util/TestUtil.scala
@@ -25,9 +25,6 @@
 
 package io.rml.framework.util
 
-import java.io.File
-import java.nio.file.Paths
-
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.util.{Format, JenaUtil, NQuads}
 import io.rml.framework.engine.{BulkPostProcessor, JsonLDProcessor, NopPostProcessor, PostProcessor}
@@ -36,6 +33,9 @@ import io.rml.framework.util.logging.Logger
 import org.apache.commons.io.FileUtils
 import org.apache.jena.rdf.model.Model
 
+import java.io.File
+import java.nio.file.Paths
+
 object TestProperties {
   def getTempDir(test: String): File = {
     val file = Paths.get(System.getProperty("java.io.tmpdir"), "rml-streamer", test).toFile
@@ -94,13 +94,7 @@ object TestUtil extends Logging {
   }
 
   private def compareSets(generatedOutput: String, expectedOutput: String, generatedOutputFormat: Format, expectedOutputFormat: Option[Format]): Boolean = {
-    val expOutForm = expectedOutputFormat match {
-      case Some(format) => format
-      case None => {
-        logWarning("Could not detect the format of the expected output. Assuming N-QUADS")
-        NQuads
-      }
-    }
+    val expOutForm = expectedOutputFormat.getOrElse(NQuads);
     val generatedModels: List[(Model, String)] = quadsToModels(generatedOutput, generatedOutputFormat)
     val expectedModels: List[(Model, String)] = quadsToModels(expectedOutput, expOutForm)
     if (generatedModels.length != expectedModels.length) {
diff --git a/src/test/scala/io/rml/framework/util/fileprocessing/MappingTestUtil.scala b/src/test/scala/io/rml/framework/util/fileprocessing/MappingTestUtil.scala
index ae8efd03..97ae304b 100644
--- a/src/test/scala/io/rml/framework/util/fileprocessing/MappingTestUtil.scala
+++ b/src/test/scala/io/rml/framework/util/fileprocessing/MappingTestUtil.scala
@@ -24,10 +24,11 @@
   **/
 package io.rml.framework.util.fileprocessing
 
-import java.io.File
-
-import io.rml.framework.core.extractors.MappingReader
+import io.rml.framework.core.extractors.TriplesMapsCache
 import io.rml.framework.core.model.FormattedRMLMapping
+import io.rml.framework.core.util.Util
+
+import java.io.File
 
 /**
   * Test helper to read the mapping file and generate a FormattedRMLMapping
@@ -37,8 +38,10 @@ object MappingTestUtil extends FileProcessingUtil[FormattedRMLMapping] {
 
 
   override def processFile(file: File): FormattedRMLMapping = {
-    val mapping = MappingReader().read(file)
-    FormattedRMLMapping.fromRMLMapping(mapping)
+    TriplesMapsCache.clear();
+    Util.readMappingFile(file.getCanonicalPath)
+    //val mapping = MappingReader().read(file)
+    //FormattedRMLMapping.fromRMLMapping(mapping.asInstanceOf[RMLMapping])
   }
 
   override def candidateFiles: List[String] = List("mapping.ttl", "mapping.rml.ttl", "example.rml.ttl")
diff --git a/src/test/scala/io/rml/framework/util/fileprocessing/TestFilesUtil.scala b/src/test/scala/io/rml/framework/util/fileprocessing/TestFilesUtil.scala
index 1ff59c40..12224f70 100644
--- a/src/test/scala/io/rml/framework/util/fileprocessing/TestFilesUtil.scala
+++ b/src/test/scala/io/rml/framework/util/fileprocessing/TestFilesUtil.scala
@@ -24,12 +24,11 @@
   **/
 package io.rml.framework.util.fileprocessing
 
-import java.io.File
-import java.nio.file.Path
-
 import io.rml.framework.core.util.Util
 import io.rml.framework.util.logging.Logger
 
+import java.io.File
+import java.nio.file.Path
 import scala.util.Sorting
 
 /**
@@ -72,11 +71,11 @@ trait TestFilesUtil[R] {
     * @param rootDir
     * @param checkFunc
     */
-  def test(rootDir: String, checkFunc: String => Unit): Unit = {
+  def test(rootDir: String, shouldPass: Boolean, checkFunc: (String, Boolean) => Unit): Unit = {
     var checkedTestCases = Array("")
     for (pathString <- getTestCaseFolders(rootDir).map(_.toString).sorted) {
 
-      checkFunc(pathString)
+      checkFunc(pathString, shouldPass)
       val testCase = new File(pathString).getName
       Logger.logSuccess("Passed processing: " + testCase)
       Logger.lineBreak()
diff --git a/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala b/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala
index 501fee73..49265772 100644
--- a/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala
+++ b/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala
@@ -24,17 +24,16 @@
   **/
 package io.rml.framework.util.fileprocessing
 
-import java.io.File
-
 import io.rml.framework.Main
-import io.rml.framework.core.extractors.MappingReader
-import io.rml.framework.core.model.FormattedRMLMapping
-import io.rml.framework.core.util.{Format, NQuads}
+import io.rml.framework.core.extractors.TriplesMapsCache
+import io.rml.framework.core.util.{Format, NQuads, Util}
 import io.rml.framework.engine.{NopPostProcessor, PostProcessor}
 import io.rml.framework.util.logging.Logger
 import org.apache.flink.api.scala.ExecutionEnvironment
 import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
 
+import java.io.File
+
 /**
   * Test helper to get generated triples after processing the mapping file
   * containing triple maps.
@@ -66,9 +65,9 @@ object TripleGeneratorTestUtil extends TestFilesUtil[(List[String], Format)] {
     */
    def processFile(file: File): (List[String], Format) = {
      try {
-       val mapping = MappingReader().read(file)
+       TriplesMapsCache.clear();
 
-       val formattedMapping = FormattedRMLMapping.fromRMLMapping(mapping)
+       val formattedMapping = Util.readMappingFile(file.getCanonicalPath)
        val dataSet = Main.createDataSetFromFormattedMapping(formattedMapping).collect
 
        // we assume quads, since we don't use a post processor
diff --git a/src/test/scala/io/rml/framework/util/server/TestSink2.scala b/src/test/scala/io/rml/framework/util/server/TestSink2.scala
index 59dcc1d3..191f4165 100644
--- a/src/test/scala/io/rml/framework/util/server/TestSink2.scala
+++ b/src/test/scala/io/rml/framework/util/server/TestSink2.scala
@@ -49,7 +49,7 @@ class TestSink2 extends SinkFunction[String] {
 
   override def invoke(value: String, context: SinkFunction.Context[_]): Unit = {
     Logger.logInfo(s"TestSink2: got value [${value}]")
-    if (!value.trim.isEmpty) {
+    if (value.trim.nonEmpty) {
       triples = value :: triples
     }
   }