--- a/test-suite/tests/rdf-0016.jsonld	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0016.jsonld	Thu Jan 05 12:20:28 2012 -0800
@@ -1,3 +1,4 @@
 {
-  FIXME
+  "@id": "",
+  "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
 }
\ No newline at end of file

--- a/test-suite/tests/rdf-0016.sparql	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0016.sparql	Thu Jan 05 12:20:28 2012 -0800
@@ -1,6 +1,5 @@
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> foaf:homepage <http://github.com/gkellogg/>
+  <http://json-ld.org/test-suite/tests/rdf-0016.jsonld> a rdfs:Resource
 }
\ No newline at end of file

--- a/test-suite/tests/rdf-0017.jsonld	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0017.jsonld	Thu Jan 05 12:20:28 2012 -0800
@@ -1,4 +1,4 @@
 {
-  "name": "FIXME",
-  "purpose": "FIXME."
-}
+  "@id": "a/b",
+  "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
+}
\ No newline at end of file

--- a/test-suite/tests/rdf-0017.sparql	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0017.sparql	Thu Jan 05 12:20:28 2012 -0800
@@ -1,6 +1,5 @@
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX doap: <http://usefulinc.com/ns/doap#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> doap:homepage <http://greggkellogg.net/>
+  <http://json-ld.org/test-suite/tests/a/b> a rdfs:Resource
 }
\ No newline at end of file

--- a/test-suite/tests/rdf-0018.jsonld	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0018.jsonld	Thu Jan 05 12:20:28 2012 -0800
@@ -1,4 +1,4 @@
 {
-  "name": "FIXME",
-  "purpose": "FIXME."
-}
+  "@id": "#frag",
+  "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
+}
\ No newline at end of file

--- a/test-suite/tests/rdf-0018.sparql	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0018.sparql	Thu Jan 05 12:20:28 2012 -0800
@@ -1,6 +1,5 @@
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX doap: <http://usefulinc.com/ns/doap#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 ASK WHERE {
-  <http://greggkellogg.net/foaf#me> doap:homepage <http://github.com/gkellogg/>
+  <http://json-ld.org/test-suite/tests/rdf-0018.jsonld#frag> a rdfs:Resource
 }
\ No newline at end of file

--- a/test-suite/tests/rdf-0025.jsonld	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-0025.jsonld	Thu Jan 05 12:20:28 2012 -0800
@@ -1,6 +1,6 @@
 {
   "@context": {
-    "knows": {"@id": "http://xmlns.com/foaf/0.1/", "@list": true}
+    "knows": {"@id": "http://xmlns.com/foaf/0.1/knows", "@list": true}
   },
   "@id": "http://greggkellogg.net/foaf#me",
   "knows": ["Manu Sporny"]

--- a/test-suite/tests/rdf-manifest.jsonld	Thu Jan 05 11:36:36 2012 -0800
+++ b/test-suite/tests/rdf-manifest.jsonld	Thu Jan 05 12:20:28 2012 -0800
@@ -98,20 +98,20 @@
     }, {
       "@type": ["test:TestCase", "jld:RDFTest"],
       "input": "rdf-0016.jsonld",
-      "name": "FIXME",
-      "purpose": "FIXME.",
+      "name": "Empty IRI expands to resource location",
+      "purpose": "Expanding an empty IRI uses the test file location.",
       "sparql": "rdf-0016.sparql"
     }, {
       "@type": ["test:TestCase", "jld:RDFTest"],
-      "name": "FIXME",
-      "purpose": "FIXME.",
-      "purpose": "Tests using @vocab in @context for IRI processing.",
+      "input": "rdf-0017.jsonld",
+      "name": "Relative IRI expands relative resource location",
+      "purpose": "Expanding a relative IRI uses the test file location.",
       "sparql": "rdf-0017.sparql"
     }, {
       "@type": ["test:TestCase", "jld:RDFTest"],
-      "name": "FIXME",
-      "purpose": "FIXME.",
-      "purpose": "Tests using @base and @vocab in @context for IRI processing.",
+      "input": "rdf-0018.jsonld",
+      "name": "Frag ID expands relative resource location",
+      "purpose": "Expanding a fragment uses the test file location.",
       "sparql": "rdf-0018.sparql"
     }, {
       "@type": ["test:TestCase", "jld:RDFTest"],
@@ -128,8 +128,8 @@
     }, {
       "@type": ["test:TestCase", "jld:RDFTest"],
       "input": "rdf-0021.jsonld",
-      "name": "Test coercion of decimal value",
-      "purpose": "Tests that a decimal value generates a xsd:decimal typed literal (buggy test).",
+      "name": "Test coercion of decimal value to double",
+      "purpose": "Tests that a decimal value generates a xsd:double typed literal.",
       "sparql": "rdf-0021.sparql"
     }, {
       "@type": ["test:TestCase", "jld:RDFTest"],
@@ -149,6 +149,18 @@
       "name": "Test coercion of boolean value",
       "purpose": "Tests that a decimal value generates a xsd:boolean typed literal.",
       "sparql": "rdf-0024.sparql"
+    }, {
+      "@type": ["test:TestCase", "jld:RDFTest"],
+      "input": "rdf-0025.jsonld",
+      "name": "Test list coercion with single element",
+      "purpose": "Tests that an array with a single element on a property with @list coercion creates an RDF Collection.",
+      "sparql": "rdf-0025.sparql"
+    }, {
+      "@type": ["test:TestCase", "jld:RDFTest"],
+      "input": "rdf-0026.jsonld",
+      "name": "Test creation of multiple types",
+      "purpose": "Tests that @type with an array of types creates multiple types.",
+      "sparql": "rdf-0026.sparql"
     }
   ]
 }