--- a/D002-1table2columns1row/manifest.ttl	Sat Aug 06 21:13:10 2011 +0100
+++ b/D002-1table2columns1row/manifest.ttl	Sat Aug 06 21:33:16 2011 +0100
@@ -20,7 +20,7 @@
 	test:reviewStatus test:accepted ;
 	rdb2rdftest:database <d002> ;
 	rdb2rdftest:hasExpectedOutput true ;	
-	rdb2rdftest:output "directGraph.n3" ;
+	rdb2rdftest:output "directGraph.nt" ;
 .
 
 <tc0002a> a rdb2rdftest:R2RML ;	

--- a/D002-1table2columns1row/r2rmlb.ttl	Sat Aug 06 21:13:10 2011 +0100
+++ b/D002-1table2columns1row/r2rmlb.ttl	Sat Aug 06 21:33:16 2011 +0100
@@ -12,7 +12,7 @@
                        Select ('Student' || ID ) AS StudentId
                             , ID
                             , Name
-                         from Student
+                         from boricles.Student
                        """
                        ];
 

--- a/D003-1table3columns1row/manifest.ttl	Sat Aug 06 21:13:10 2011 +0100
+++ b/D003-1table3columns1row/manifest.ttl	Sat Aug 06 21:33:16 2011 +0100
@@ -14,61 +14,37 @@
 	rdb2rdftest:relatedTestCase <tc0003d> ;
 .
 
-<dg0003> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "Three column mapping"; 
-	dcterms:identifier "Direct Graph TC0003" ;
-	test:purpose "Tests: (1) three column mapping, no primary key; (2) Generation of a \"BlankNode\" subject; (3) One column to one property" ;
+<dg0002> a rdb2rdftest:DirectMapping ;	
+	dcterms:title "Two columns mapping" ; 
+	dcterms:identifier "Direct Graph TC0002" ;
+	test:purpose "Tests: (1) two columns mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d003> ;
-	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:database <d002> ;
+	rdb2rdftest:hasExpectedOutput true ;	
 	rdb2rdftest:output "directGraph.nt" ;
 .
 
-<tc0003a> a rdb2rdftest:R2RML ;	
+<tc0002a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two columns mapping" ; 
-	dcterms:identifier "R2RMLTC0003a" ;
-	test:purpose "Tests: (1)three column mapping, no primary key; (2) Subject URI generated by concatenation of three column values and a constant value; (3) One column to one property" ;
+	dcterms:identifier "R2RMLTC0002a" ;
+	test:purpose "Tests: (1) two column mapping, no primary key; (2) subject URI generated by concatenation of two column values; (3) one column to one property" ;
 	test:specificationReference "#dfn-output-dataset" ;
 	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d003> ;
+	rdb2rdftest:database <d002> ;
 	rdb2rdftest:output "mappeda.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:hasExpectedOutput true ;	
 	rdb2rdftest:mappingDocument "r2rmla.ttl" ;
 .
 
-<tc0003b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two column mapping, a concatenation operation" ; 
-	dcterms:identifier "R2RMLTC0003b" ;
-	test:purpose "Tests: (1) two column mapping, no primary key; (2) subject URI generated by concatenation of three column values and a constant value; (3) Two column to one property – concat operation" ;
+<tc0002b> a rdb2rdftest:R2RML ;	
+	dcterms:title "Two columns mapping" ; 
+	dcterms:identifier "R2RMLTC0002b" ;
+	test:purpose "Tests: (1) two column mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
 	test:specificationReference "#dfn-output-dataset" ;
 	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d003> ;
+	rdb2rdftest:database <d002> ;
 	rdb2rdftest:output "mappedb.nq" ;
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
-.
-
-<tc0003c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three column mapping" ; 
-	dcterms:identifier "R2RMLTC0003c" ;
-	test:purpose "Tests: (1) three column mapping, no primary key; (2) Generation of a \"BlankNode\" subject; (3) One column to one property" ;
-	test:specificationReference "#dfn-output-dataset" ;
-	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d003> ;
-	rdb2rdftest:output "mappedc.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;
-	rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
-.
-
-<tc0003d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two column mapping, a concatenation operation" ; 
-	dcterms:identifier "R2RMLTC0003d" ;
-	test:purpose "Tests: (1) two column mapping, no primary key; (2) Generation of a \"BlankNode\" subject; (3) Two column to one property – concat operation" ;
-	test:specificationReference "#dfn-output-dataset" ;
-	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d003> ;
-	rdb2rdftest:output "mappedd.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;
-	rdb2rdftest:mappingDocument "r2rmld.ttl" ;
 .
\ No newline at end of file