--- a/test-suite/tests/fromRdf-0002.jsonld	Sun Apr 29 23:51:35 2012 -0400
+++ b/test-suite/tests/fromRdf-0002.jsonld	Mon Apr 30 01:11:09 2012 -0400
@@ -1,10 +1,10 @@
 [{
   "@id": "http://example.com/Subj1",
   "http://example.com/prop": [
-    true,
-    false,
-    1,
+    {"@value": "true", "@type": "http://www.w3.org/2001/XMLSchema#boolean"},
+    {"@value": "false", "@type": "http://www.w3.org/2001/XMLSchema#boolean"},
+    {"@value": "1", "@type": "http://www.w3.org/2001/XMLSchema#integer"},
     {"@value": "1.1", "@type": "http://www.w3.org/2001/XMLSchema#decimal"},
-    1.1E1
+    {"@value": "1.1E1", "@type": "http://www.w3.org/2001/XMLSchema#double"}
   ]
 }]
\ No newline at end of file

--- a/test-suite/tests/fromRdf-0007.jsonld	Sun Apr 29 23:51:35 2012 -0400
+++ b/test-suite/tests/fromRdf-0007.jsonld	Mon Apr 30 01:11:09 2012 -0400
@@ -17,7 +17,10 @@
     "@graph": [
       {
         "@id": "http://en.wikipedia.org/wiki/Berlin",
-        "http://data.wikipedia.org/vocab#population": [3499879]
+        "http://data.wikipedia.org/vocab#population": [{
+          "@value": "3499879",
+          "@type": "http://www.w3.org/2001/XMLSchema#integer"
+        }]
       }
     ]
   }

--- a/test-suite/tests/fromRdf-manifest.jsonld	Sun Apr 29 23:51:35 2012 -0400
+++ b/test-suite/tests/fromRdf-manifest.jsonld	Mon Apr 30 01:11:09 2012 -0400
@@ -2,7 +2,7 @@
   "@context": "http://json-ld.org/test-suite/context.jsonld",
   "@id": "",
   "@type": "jld:Manifest",
-  "rdfs:comment": "RDF to JSON-LD tests take either N-Triples, N-Quads, Turtle or Trig Input",
+  "rdfs:comment": "RDF to JSON-LD tests take N-Quads Input",
   "name": "fromRdf",
   "sequence": [
     {
@@ -31,19 +31,19 @@
       "expect": "fromRdf-0004.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:FromRDFTest"],
-      "name": "TriG document with list",
+      "name": "Document with list",
       "purpose": "Uses a named graph containing a list.",
       "input": "fromRdf-0005.nq",
       "expect": "fromRdf-0005.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:FromRDFTest"],
-      "name": "TriG with two graphs having same subject but different values",
+      "name": "Two graphs having same subject but different values",
       "purpose": "Ensure that properties and list elements aren't confused between graphs.",
       "input": "fromRdf-0006.nq",
       "expect": "fromRdf-0006.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:FromRDFTest"],
-      "name": "TriG graph with multiple named graphs",
+      "name": "Graph with multiple named graphs",
       "purpose": "Testing @graph recursion.",
       "input": "fromRdf-0007.nq",
       "expect": "fromRdf-0007.jsonld"