diff --git a/src/test/resources/test-cases/RMLTC0000-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0000-SPARQL/mapping.ttl
index ce80d44a..3ef5916d 100644
--- a/src/test/resources/test-cases/RMLTC0000-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0000-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://www.example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0001a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0001a-SPARQL/mapping.ttl
index f4ce9979..0c96c082 100644
--- a/src/test/resources/test-cases/RMLTC0001a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0001a-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://www.example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0001b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0001b-SPARQL/mapping.ttl
index f4ce9979..0c96c082 100644
--- a/src/test/resources/test-cases/RMLTC0001b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0001b-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://www.example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0002a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0002a-SPARQL/mapping.ttl
index e00fff6b..153c5a4e 100644
--- a/src/test/resources/test-cases/RMLTC0002a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0002a-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -44,4 +45,4 @@
     rr:predicateObjectMap [
     rr:predicate foaf:name ;
     rr:objectMap [ rml:reference "Name.value" ]
-    ].
\ No newline at end of file
+    ].
diff --git a/src/test/resources/test-cases/RMLTC0002b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0002b-SPARQL/mapping.ttl
index 1ec413a7..572cdc45 100644
--- a/src/test/resources/test-cases/RMLTC0002b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0002b-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -39,4 +40,4 @@
       rr:predicateObjectMap [
         rr:predicate foaf:name;
         rr:objectMap [ rml:reference "Name.value" ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0002g-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0002g-SPARQL/mapping.ttl
index fa004536..a6de6238 100644
--- a/src/test/resources/test-cases/RMLTC0002g-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0002g-SPARQL/mapping.ttl
@@ -38,4 +38,4 @@
         rr:predicateObjectMap [
           rr:predicate ex:id ;
           rr:objectMap [ rml:reference "IDs" ]
-        ].
\ No newline at end of file
+        ].
diff --git a/src/test/resources/test-cases/RMLTC0002h-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0002h-SPARQL/mapping.ttl
index 2661aa43..0da99c93 100644
--- a/src/test/resources/test-cases/RMLTC0002h-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0002h-SPARQL/mapping.ttl
@@ -37,4 +37,4 @@
         rr:predicateObjectMap [
           rr:predicate ex:id ;
           rr:objectMap [ rml:reference "IDs" ]
-        ].
\ No newline at end of file
+        ].
diff --git a/src/test/resources/test-cases/RMLTC0003c-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0003c-SPARQL/mapping.ttl
index 3d875c18..c017cd23 100644
--- a/src/test/resources/test-cases/RMLTC0003c-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0003c-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -42,4 +43,4 @@
           rr:template "{FirstName.value} {LastName.value}";
           rr:termType rr:Literal;
         ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0004a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0004a-SPARQL/mapping.ttl
index 38d352bd..de87246e 100644
--- a/src/test/resources/test-cases/RMLTC0004a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0004a-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0004b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0004b-SPARQL/mapping.ttl
index e2784ff2..a31697f9 100644
--- a/src/test/resources/test-cases/RMLTC0004b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0004b-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/>.
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0006a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0006a-SPARQL/mapping.ttl
index d5e651f3..8b64f1c2 100644
--- a/src/test/resources/test-cases/RMLTC0006a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0006a-SPARQL/mapping.ttl
@@ -39,4 +39,4 @@
       rr:predicateObjectMap [
         rr:predicateMap [ rr:constant ex:description ];
         rr:objectMap [ rr:constant "Bad Student"; ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0007a-JSON/mapping.ttl b/src/test/resources/test-cases/RMLTC0007a-JSON/mapping.ttl
index d2b86553..a64e94e8 100644
--- a/src/test/resources/test-cases/RMLTC0007a-JSON/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007a-JSON/mapping.ttl
@@ -4,6 +4,7 @@
 @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;
diff --git a/src/test/resources/test-cases/RMLTC0007a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007a-SPARQL/mapping.ttl
index b45b65e7..31f32961 100644
--- a/src/test/resources/test-cases/RMLTC0007a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007a-SPARQL/mapping.ttl
@@ -7,7 +7,8 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0007b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007b-SPARQL/mapping.ttl
index d0c00e0f..c89f0a28 100644
--- a/src/test/resources/test-cases/RMLTC0007b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007b-SPARQL/mapping.ttl
@@ -7,6 +7,8 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -45,4 +47,4 @@
       rr:predicateObjectMap [
         rr:predicate foaf:name;
         rr:objectMap [ rml:reference "FirstName.value" ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0007b-XML/mapping.ttl b/src/test/resources/test-cases/RMLTC0007b-XML/mapping.ttl
index 08703a34..31d58455 100644
--- a/src/test/resources/test-cases/RMLTC0007b-XML/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007b-XML/mapping.ttl
@@ -4,6 +4,7 @@
 @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;
diff --git a/src/test/resources/test-cases/RMLTC0007c-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007c-SPARQL/mapping.ttl
index 74f61419..d12df973 100644
--- a/src/test/resources/test-cases/RMLTC0007c-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007c-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -40,4 +41,4 @@
       rr:predicateObjectMap [
         rr:predicate foaf:name;
         rr:objectMap [ rml:reference "FirstName.value" ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0007d-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007d-SPARQL/mapping.ttl
index 15a1a72b..e7612b38 100644
--- a/src/test/resources/test-cases/RMLTC0007d-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007d-SPARQL/mapping.ttl
@@ -7,7 +7,8 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -50,4 +51,4 @@
       rr:predicateObjectMap [
         rr:predicate foaf:name;
         rr:objectMap [ rml:reference "FirstName.value" ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0007e-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007e-SPARQL/mapping.ttl
index f9171ba1..463add74 100644
--- a/src/test/resources/test-cases/RMLTC0007e-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007e-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -36,4 +37,4 @@
         rr:template "http://example.com/Student/{ID.value}/{FirstName.value}";
         rr:graph ex:PersonGraph ;
         rr:class foaf:Person
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0007f-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007f-SPARQL/mapping.ttl
index e4651680..ceffd5d4 100644
--- a/src/test/resources/test-cases/RMLTC0007f-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007f-SPARQL/mapping.ttl
@@ -7,7 +7,8 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
diff --git a/src/test/resources/test-cases/RMLTC0007g-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007g-SPARQL/mapping.ttl
index 89e64f62..9d54fc39 100644
--- a/src/test/resources/test-cases/RMLTC0007g-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007g-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -42,4 +43,4 @@
         rr:objectMap [
           rml:reference "FirstName.value"
         ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0007h-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0007h-SPARQL/mapping.ttl
index 80fb91cb..12608320 100644
--- a/src/test/resources/test-cases/RMLTC0007h-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0007h-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -42,4 +43,4 @@
         rr:objectMap [
           rml:reference "Name.value"
         ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0008a-JSON/mapping.ttl b/src/test/resources/test-cases/RMLTC0008a-JSON/mapping.ttl
index 2f972338..e7555251 100644
--- a/src/test/resources/test-cases/RMLTC0008a-JSON/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008a-JSON/mapping.ttl
@@ -4,6 +4,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0008a-MySQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008a-MySQL/mapping.ttl
index 255e44dc..550d8444 100644
--- a/src/test/resources/test-cases/RMLTC0008a-MySQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008a-MySQL/mapping.ttl
@@ -4,6 +4,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0008a-PostgreSQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008a-PostgreSQL/mapping.ttl
index 2b3d658b..a75e65a0 100644
--- a/src/test/resources/test-cases/RMLTC0008a-PostgreSQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008a-PostgreSQL/mapping.ttl
@@ -4,6 +4,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0008a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008a-SPARQL/mapping.ttl
index 8d40ef4e..d75cdd51 100644
--- a/src/test/resources/test-cases/RMLTC0008a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008a-SPARQL/mapping.ttl
@@ -7,6 +7,8 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -56,4 +58,4 @@
       rr:predicateObjectMap [
         rr:predicate ex:Sport ;
         rr:objectMap [ rml:reference "Sport.value" ]
-      ] .
\ No newline at end of file
+      ] .
diff --git a/src/test/resources/test-cases/RMLTC0008a-SQLServer/mapping.ttl b/src/test/resources/test-cases/RMLTC0008a-SQLServer/mapping.ttl
index 0e80e5e3..f28dacc9 100644
--- a/src/test/resources/test-cases/RMLTC0008a-SQLServer/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008a-SQLServer/mapping.ttl
@@ -4,6 +4,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0008a-XML/mapping.ttl b/src/test/resources/test-cases/RMLTC0008a-XML/mapping.ttl
index e8ac6b61..0b7f30a4 100644
--- a/src/test/resources/test-cases/RMLTC0008a-XML/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008a-XML/mapping.ttl
@@ -4,6 +4,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0008b-CSV/mapping.ttl b/src/test/resources/test-cases/RMLTC0008b-CSV/mapping.ttl
index 8b2b1c99..836348de 100644
--- a/src/test/resources/test-cases/RMLTC0008b-CSV/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008b-CSV/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0008b-JSON/mapping.ttl b/src/test/resources/test-cases/RMLTC0008b-JSON/mapping.ttl
index b7018ad7..5a721b6d 100644
--- a/src/test/resources/test-cases/RMLTC0008b-JSON/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008b-JSON/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0008b-MySQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008b-MySQL/mapping.ttl
index 8205704d..b8c6ed75 100644
--- a/src/test/resources/test-cases/RMLTC0008b-MySQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008b-MySQL/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0008b-PostgreSQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008b-PostgreSQL/mapping.ttl
index 2885d662..f05d6b3f 100644
--- a/src/test/resources/test-cases/RMLTC0008b-PostgreSQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008b-PostgreSQL/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0008b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008b-SPARQL/mapping.ttl
index 3e293bc8..ddafbf92 100644
--- a/src/test/resources/test-cases/RMLTC0008b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008b-SPARQL/mapping.ttl
@@ -8,6 +8,8 @@
 @prefix activity: <http://example.com/activity/> .
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -85,4 +87,4 @@
 
     <RefObjectMap1>
       a rr:RefObjectMap;
-      rr:parentTriplesMap <TriplesMap2> .
\ No newline at end of file
+      rr:parentTriplesMap <TriplesMap2> .
diff --git a/src/test/resources/test-cases/RMLTC0008b-SQLServer/mapping.ttl b/src/test/resources/test-cases/RMLTC0008b-SQLServer/mapping.ttl
index a8dcdd90..589ca5f5 100644
--- a/src/test/resources/test-cases/RMLTC0008b-SQLServer/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008b-SQLServer/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0008c-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0008c-SPARQL/mapping.ttl
index 79f7bbd7..701e2900 100644
--- a/src/test/resources/test-cases/RMLTC0008c-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0008c-SPARQL/mapping.ttl
@@ -1,12 +1,13 @@
-@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 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 d2rq:       <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix sd:         <http://www.w3.org/ns/sparql-service-description#> .
 @base <http://example.com/base/> .
-@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
 <#InputSPARQL>
     a sd:Service ;
diff --git a/src/test/resources/test-cases/RMLTC0009a-CSV/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-CSV/mapping.ttl
index 86f93ae9..d2fedc35 100644
--- a/src/test/resources/test-cases/RMLTC0009a-CSV/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-CSV/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0009a-JSON/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-JSON/mapping.ttl
index 8615e64b..20d59d52 100644
--- a/src/test/resources/test-cases/RMLTC0009a-JSON/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-JSON/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0009a-MySQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-MySQL/mapping.ttl
index 172e9c03..3e103c4c 100644
--- a/src/test/resources/test-cases/RMLTC0009a-MySQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-MySQL/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0009a-PostgreSQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-PostgreSQL/mapping.ttl
index 35f28813..95e2ba81 100644
--- a/src/test/resources/test-cases/RMLTC0009a-PostgreSQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-PostgreSQL/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0009a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-SPARQL/mapping.ttl
index 482b44bd..3bd75e28 100644
--- a/src/test/resources/test-cases/RMLTC0009a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-SPARQL/mapping.ttl
@@ -1,12 +1,14 @@
-@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 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#> .
+@prefix d2rq:       <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix sd:         <http://www.w3.org/ns/sparql-service-description#> .
 @base <http://example.com/base/> .
-@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
 <#InputSPARQL1>
     a sd:Service ;
diff --git a/src/test/resources/test-cases/RMLTC0009a-SQLServer/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-SQLServer/mapping.ttl
index 4ca36f79..21399ba0 100644
--- a/src/test/resources/test-cases/RMLTC0009a-SQLServer/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-SQLServer/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0009a-XML/mapping.ttl b/src/test/resources/test-cases/RMLTC0009a-XML/mapping.ttl
index 50b32d48..1595b3be 100644
--- a/src/test/resources/test-cases/RMLTC0009a-XML/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009a-XML/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0009b-CSV/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-CSV/mapping.ttl
index 0bc35934..91253f04 100644
--- a/src/test/resources/test-cases/RMLTC0009b-CSV/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-CSV/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0009b-JSON/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-JSON/mapping.ttl
index fc8d1eba..8456985e 100644
--- a/src/test/resources/test-cases/RMLTC0009b-JSON/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-JSON/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0009b-MySQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-MySQL/mapping.ttl
index 4f445248..d6c7c85e 100644
--- a/src/test/resources/test-cases/RMLTC0009b-MySQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-MySQL/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0009b-PostgreSQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-PostgreSQL/mapping.ttl
index ad2faeed..796b90fc 100644
--- a/src/test/resources/test-cases/RMLTC0009b-PostgreSQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-PostgreSQL/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0009b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-SPARQL/mapping.ttl
index d5fff23e..59929b0c 100644
--- a/src/test/resources/test-cases/RMLTC0009b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-SPARQL/mapping.ttl
@@ -1,12 +1,14 @@
-@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 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#> .
+@prefix d2rq:       <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix sd:         <http://www.w3.org/ns/sparql-service-description#> .
 @base <http://example.com/base/> .
-@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
 <#InputSPARQL1>
     a sd:Service ;
diff --git a/src/test/resources/test-cases/RMLTC0009b-SQLServer/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-SQLServer/mapping.ttl
index c0be7c88..d0eef0f8 100644
--- a/src/test/resources/test-cases/RMLTC0009b-SQLServer/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-SQLServer/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
diff --git a/src/test/resources/test-cases/RMLTC0009b-XML/mapping.ttl b/src/test/resources/test-cases/RMLTC0009b-XML/mapping.ttl
index 42349c92..7dfbea3b 100644
--- a/src/test/resources/test-cases/RMLTC0009b-XML/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0009b-XML/mapping.ttl
@@ -5,6 +5,7 @@
 @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>
diff --git a/src/test/resources/test-cases/RMLTC0012a-MySQL/output.nq b/src/test/resources/test-cases/RMLTC0012a-MySQL/output.nq
index de57968a..10e4040a 100644
--- a/src/test/resources/test-cases/RMLTC0012a-MySQL/output.nq
+++ b/src/test/resources/test-cases/RMLTC0012a-MySQL/output.nq
@@ -2,3 +2,4 @@ _:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSche
 _:Bob_Smith_30 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
 _:Sue_Jones_20 <http://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+
diff --git a/src/test/resources/test-cases/RMLTC0012a-PostgreSQL/output.nq b/src/test/resources/test-cases/RMLTC0012a-PostgreSQL/output.nq
index de57968a..10e4040a 100644
--- a/src/test/resources/test-cases/RMLTC0012a-PostgreSQL/output.nq
+++ b/src/test/resources/test-cases/RMLTC0012a-PostgreSQL/output.nq
@@ -2,3 +2,4 @@ _:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSche
 _:Bob_Smith_30 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
 _:Sue_Jones_20 <http://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+
diff --git a/src/test/resources/test-cases/RMLTC0012a-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0012a-SPARQL/mapping.ttl
index a3db34b6..0ec54f97 100644
--- a/src/test/resources/test-cases/RMLTC0012a-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0012a-SPARQL/mapping.ttl
@@ -7,6 +7,7 @@
 @prefix sd:     <http://www.w3.org/ns/sparql-service-description#>.
 @prefix ex:     <http://example.com/> .
 @prefix hydra:  <http://www.w3.org/ns/hydra/core#> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
 @base <http://example.com/base> .
 
 <#InputSPARQL>
@@ -47,4 +48,4 @@
         rr:objectMap    [
           rml:reference "amount.value";
         ]
-      ].
\ No newline at end of file
+      ].
diff --git a/src/test/resources/test-cases/RMLTC0012a-SQLServer/output.nq b/src/test/resources/test-cases/RMLTC0012a-SQLServer/output.nq
index de57968a..10e4040a 100644
--- a/src/test/resources/test-cases/RMLTC0012a-SQLServer/output.nq
+++ b/src/test/resources/test-cases/RMLTC0012a-SQLServer/output.nq
@@ -2,3 +2,4 @@ _:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSche
 _:Bob_Smith_30 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
 _:Sue_Jones_20 <http://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+
diff --git a/src/test/resources/test-cases/RMLTC0012b-SPARQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0012b-SPARQL/mapping.ttl
index b2af38c8..38c6155f 100644
--- a/src/test/resources/test-cases/RMLTC0012b-SPARQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0012b-SPARQL/mapping.ttl
@@ -1,12 +1,13 @@
 @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 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 d2rq:       <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix sd:         <http://www.w3.org/ns/sparql-service-description#> .
 @base <http://example.com/base/> .
-@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
 
 <#InputSPARQL1>
     a sd:Service ;
diff --git a/src/test/resources/test-cases/RMLTC0012e-MySQL/resource.sql b/src/test/resources/test-cases/RMLTC0012e-MySQL/resource.sql
index e1600c56..718792c7 100644
--- a/src/test/resources/test-cases/RMLTC0012e-MySQL/resource.sql
+++ b/src/test/resources/test-cases/RMLTC0012e-MySQL/resource.sql
@@ -6,9 +6,9 @@ CREATE TABLE IOUs (
       fname VARCHAR(20),
       lname VARCHAR(20),
       amount FLOAT);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30.0);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20.0);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30.0);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
 
 CREATE TABLE Lives (
       fname VARCHAR(20),
diff --git a/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/output.nq b/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/output.nq
index f9a73fc5..caec8253 100644
--- a/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/output.nq
+++ b/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/output.nq
@@ -14,3 +14,4 @@ _:Sue_Jones_Madrid <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://exa
 _:Sue_Jones_Madrid <http://example.com/base/IOUs#fname> "Sue" .
 _:Sue_Jones_Madrid <http://example.com/base/IOUs#lname> "Jones" .
 _:Sue_Jones_Madrid <http://example.com/base/IOUs#city> "Madrid" .
+
diff --git a/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/resource.sql b/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/resource.sql
index d5589112..46e386f7 100644
--- a/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/resource.sql
+++ b/src/test/resources/test-cases/RMLTC0012e-PostgreSQL/resource.sql
@@ -5,9 +5,9 @@ CREATE TABLE IOUs (
       fname VARCHAR(20),
       lname VARCHAR(20),
       amount FLOAT);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30.0);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20.0);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30.0);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
 
 CREATE TABLE Lives (
       fname VARCHAR(20),
diff --git a/src/test/resources/test-cases/RMLTC0012e-SQLServer/output.nq b/src/test/resources/test-cases/RMLTC0012e-SQLServer/output.nq
index 4b6c1b49..caec8253 100644
--- a/src/test/resources/test-cases/RMLTC0012e-SQLServer/output.nq
+++ b/src/test/resources/test-cases/RMLTC0012e-SQLServer/output.nq
@@ -1,11 +1,11 @@
-_:Bob_Smith_30.0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
-_:Bob_Smith_30.0 <http://example.com/base/IOUs#fname> "Bob" .
-_:Bob_Smith_30.0 <http://example.com/base/IOUs#lname> "Smith" .
-_:Bob_Smith_30.0 <http://example.com/base/IOUs#amount> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
-_:Sue_Jones_20.0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
-_:Sue_Jones_20.0 <http://example.com/base/IOUs#fname> "Sue" .
-_:Sue_Jones_20.0 <http://example.com/base/IOUs#lname> "Jones" .
-_:Sue_Jones_20.0 <http://example.com/base/IOUs#amount> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:Bob_Smith_30 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
+_:Bob_Smith_30 <http://example.com/base/IOUs#fname> "Bob" .
+_:Bob_Smith_30 <http://example.com/base/IOUs#lname> "Smith" .
+_:Bob_Smith_30 <http://example.com/base/IOUs#amount> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:Sue_Jones_20 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
+_:Sue_Jones_20 <http://example.com/base/IOUs#fname> "Sue" .
+_:Sue_Jones_20 <http://example.com/base/IOUs#lname> "Jones" .
+_:Sue_Jones_20 <http://example.com/base/IOUs#amount> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
 _:Bob_Smith_London <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/Lives> .
 _:Bob_Smith_London <http://example.com/base/IOUs#fname> "Bob" .
 _:Bob_Smith_London <http://example.com/base/IOUs#lname> "Smith" .
@@ -14,3 +14,4 @@ _:Sue_Jones_Madrid <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://exa
 _:Sue_Jones_Madrid <http://example.com/base/IOUs#fname> "Sue" .
 _:Sue_Jones_Madrid <http://example.com/base/IOUs#lname> "Jones" .
 _:Sue_Jones_Madrid <http://example.com/base/IOUs#city> "Madrid" .
+
diff --git a/src/test/resources/test-cases/RMLTC0012e-SQLServer/resource.sql b/src/test/resources/test-cases/RMLTC0012e-SQLServer/resource.sql
index f9180ce8..8fab5e6f 100644
--- a/src/test/resources/test-cases/RMLTC0012e-SQLServer/resource.sql
+++ b/src/test/resources/test-cases/RMLTC0012e-SQLServer/resource.sql
@@ -6,9 +6,9 @@ CREATE TABLE IOUs (
       fname VARCHAR(20),
       lname VARCHAR(20),
       amount FLOAT);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30.0);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20.0);
-INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30.0);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
 
 CREATE TABLE Lives (
       fname VARCHAR(20),
diff --git a/src/test/resources/test-cases/RMLTC0015a-CSV/mapping.ttl b/src/test/resources/test-cases/RMLTC0015a-CSV/mapping.ttl
index e42e2d0b..4b5ec259 100644
--- a/src/test/resources/test-cases/RMLTC0015a-CSV/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015a-CSV/mapping.ttl
@@ -4,6 +4,7 @@
 @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 rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015a-JSON/mapping.ttl b/src/test/resources/test-cases/RMLTC0015a-JSON/mapping.ttl
index 77e47588..47405fd7 100644
--- a/src/test/resources/test-cases/RMLTC0015a-JSON/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015a-JSON/mapping.ttl
@@ -4,6 +4,7 @@
 @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 rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015a-MySQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0015a-MySQL/mapping.ttl
index 52c8202a..2074045c 100644
--- a/src/test/resources/test-cases/RMLTC0015a-MySQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015a-MySQL/mapping.ttl
@@ -5,6 +5,7 @@
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl
index b1be7019..b76862a7 100644
--- a/src/test/resources/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015a-PostgreSQL/mapping.ttl
@@ -5,6 +5,7 @@
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015a-SQLServer/mapping.ttl b/src/test/resources/test-cases/RMLTC0015a-SQLServer/mapping.ttl
index 7c3b8671..6c79f9fe 100644
--- a/src/test/resources/test-cases/RMLTC0015a-SQLServer/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015a-SQLServer/mapping.ttl
@@ -5,6 +5,7 @@
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015a-XML/mapping.ttl b/src/test/resources/test-cases/RMLTC0015a-XML/mapping.ttl
index 0457cc59..5677fe45 100644
--- a/src/test/resources/test-cases/RMLTC0015a-XML/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015a-XML/mapping.ttl
@@ -4,6 +4,7 @@
 @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 rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015b-MySQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0015b-MySQL/mapping.ttl
index a470a707..5f70f31e 100644
--- a/src/test/resources/test-cases/RMLTC0015b-MySQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015b-MySQL/mapping.ttl
@@ -5,6 +5,7 @@
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl b/src/test/resources/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl
index 1954b473..b0f654ea 100644
--- a/src/test/resources/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015b-PostgreSQL/mapping.ttl
@@ -5,6 +5,7 @@
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0015b-SQLServer/mapping.ttl b/src/test/resources/test-cases/RMLTC0015b-SQLServer/mapping.ttl
index 8ed56590..b0f9124b 100644
--- a/src/test/resources/test-cases/RMLTC0015b-SQLServer/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0015b-SQLServer/mapping.ttl
@@ -5,6 +5,7 @@
 @prefix rml: <http://semweb.mmlab.be/ns/rml#> .
 @prefix ql: <http://semweb.mmlab.be/ns/ql#> .
 @prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @base <http://example.com/base/> .
 
 <TriplesMap1>
diff --git a/src/test/resources/test-cases/RMLTC0020a-CSV/mapping.ttl b/src/test/resources/test-cases/RMLTC0020a-CSV/mapping.ttl
index 58877c84..8eb9f19a 100644
--- a/src/test/resources/test-cases/RMLTC0020a-CSV/mapping.ttl
+++ b/src/test/resources/test-cases/RMLTC0020a-CSV/mapping.ttl
@@ -5,6 +5,7 @@
 @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/> .