--- a/spec/latest/json-ld-api/index.html	Sat May 05 21:31:32 2012 +0800
+++ b/spec/latest/json-ld-api/index.html	Sun May 06 00:27:45 2012 +0800
@@ -1169,10 +1169,8 @@
         <tref>term</tref> associated with the partially
         matched IRI in the <tref>active context</tref> concatenated with a
         colon (:) character and the unmatched part of <em>iri</em>.</li>
-      <li>If <em>terms</em> is empty, and <em>iri</em> has a mapping to <tref>null</tref>,
-        return <tref>null</tref>.</li>
-      <li>Otherwise if <em>terms</em> is empty, add <em>iri</em> to <em>terms</em>.</li>
-      <li>Return the shortest and lexicographically least value in <em>terms</em>.</li>
+      <li>If <em>terms</em> is empty, return <em>iri</em>.</li>
+      <li>Otherwise, return the shortest and lexicographically least value in <em>terms</em>.</li>
     </ol>
   </p>
 </section>

--- a/test-suite/tests/compact-0017-context.jsonld	Sat May 05 21:31:32 2012 +0800
+++ b/test-suite/tests/compact-0017-context.jsonld	Sun May 06 00:27:45 2012 +0800
@@ -1,6 +1,11 @@
 {
-  "@context": {
-    "http://www.w3.org/2000/01/rdf-schema#comment": null,
-    "comment_en": {"@id": "http://www.w3.org/2000/01/rdf-schema#comment", "@language": "en"}
-  }
-}
\ No newline at end of file
+  "@context": [
+    {
+      "comment": { "@id": "http://www.w3.org/2000/01/rdf-schema#comment", "@language": "en" }
+    },
+    {
+      "comment": { "@id": null },
+      "comment_en": { "@id": "http://www.w3.org/2000/01/rdf-schema#comment", "@language": "en" }
+    }
+  ]
+}

--- a/test-suite/tests/compact-0017-in.jsonld	Sat May 05 21:31:32 2012 +0800
+++ b/test-suite/tests/compact-0017-in.jsonld	Sun May 06 00:27:45 2012 +0800
@@ -1,6 +1,6 @@
 {
   "http://www.w3.org/2000/01/rdf-schema#comment": [
-    {"@value": "Kommenten auf Deutch.","@language": "de"},
-    {"@value": "Comment in English.","@language": "en"}
+    { "@value": "Kommentar auf Deutsch.", "@language": "de" },
+    { "@value": "Comment in English.", "@language": "en" }
   ]
-}
\ No newline at end of file
+}

--- a/test-suite/tests/compact-0017-out.jsonld	Sat May 05 21:31:32 2012 +0800
+++ b/test-suite/tests/compact-0017-out.jsonld	Sun May 06 00:27:45 2012 +0800
@@ -1,7 +1,15 @@
 {
-  "@context": {
-    "http://www.w3.org/2000/01/rdf-schema#comment": null,
-    "comment_en": {"@id": "http://www.w3.org/2000/01/rdf-schema#comment", "@language": "en"}
-  },
-  "comment_en": "Comment in English."
+  "@context": [
+    {
+      "comment": { "@id": "http://www.w3.org/2000/01/rdf-schema#comment", "@language": "en" }
+    },
+    {
+      "comment": { "@id": null },
+      "comment_en": { "@id": "http://www.w3.org/2000/01/rdf-schema#comment", "@language": "en" }
+    }
+  ],
+  "comment_en": [
+    { "@value": "Kommentar auf Deutsch.", "@language": "de" },
+    "Comment in English."
+  ]
 }

--- a/test-suite/tests/compact-manifest.jsonld	Sat May 05 21:31:32 2012 +0800
+++ b/test-suite/tests/compact-manifest.jsonld	Sun May 06 00:27:45 2012 +0800
@@ -103,7 +103,7 @@
     "expect": "compact-0016-out.jsonld"
   }, {
     "@type": ["test:TestCase", "jld:CompactTest"],
-    "name": "Absolute IRI mapped to null is removed from output, except if it is used in a term",
+    "name": "A term mapping to null removes the mapping",
     "input": "compact-0017-in.jsonld",
     "context": "compact-0017-context.jsonld",
     "expect": "compact-0017-out.jsonld"