--- a/test-suite/tests/compact-0018-in.jsonld	Sat Dec 08 16:44:09 2012 +0100
+++ b/test-suite/tests/compact-0018-in.jsonld	Sat Dec 08 17:00:14 2012 +0100
@@ -10,9 +10,9 @@
         { "@value": "v1.1", "@language": "de" },
         { "@value": "v1.2", "@language": "de" },
         { "@value": "v1.3", "@language": "de" },
-        4,
+        { "@value": "v1.4", "@language": "de" },
         { "@value": "v1.5", "@language": "de" },
-        { "@value": "v1.6", "@language": "en" }
+        { "@value": "v1.6", "@language": "de" }
       ]
     },
     {
@@ -20,19 +20,19 @@
         { "@value": "v2.1", "@language": "en" },
         { "@value": "v2.2", "@language": "en" },
         { "@value": "v2.3", "@language": "en" },
-        4,
+        { "@value": "v2.4", "@language": "en" },
         { "@value": "v2.5", "@language": "en" },
-        { "@value": "v2.6", "@language": "de" }
+        { "@value": "v2.6", "@language": "en" }
       ]
     },
     {
       "@list": [
-        { "@value": "v3.1", "@language": null },
-        { "@value": "v3.2", "@language": null },
+        "v3.1",
+        32,
         "v3.3",
-        4,
-        { "@value": "v3.5", "@language": "en" },
-        { "@value": "v3.6", "@language": "en" }
+        34,
+        "v3.5",
+        "v3.6"
       ]
     },
     {
@@ -41,8 +41,8 @@
         { "@value": "v4.2", "@type": "type1" },
         { "@value": "v4.3", "@type": "type1" },
         { "@value": "v4.4", "@type": "type1" },
-        { "@value": "v4.5", "@language": "de" },
-        { "@value": "v4.6", "@language": "en" }
+        { "@value": "v4.5", "@type": "type1" },
+        { "@value": "v4.6", "@type": "type1" }
       ]
     },
     {
@@ -50,9 +50,9 @@
         { "@value": "v5.1", "@type": "type2" },
         { "@value": "v5.2", "@type": "type2" },
         { "@value": "v5.3", "@type": "type2" },
-        4,
+        { "@value": "v5.4", "@type": "type2" },
         { "@value": "v5.5", "@type": "type2" },
-        "v5.6"
+        { "@value": "v5.6", "@type": "type2" }
       ]
     }
   ]

--- a/test-suite/tests/compact-0018-out.jsonld	Sat Dec 08 16:44:09 2012 +0100
+++ b/test-suite/tests/compact-0018-out.jsonld	Sat Dec 08 17:00:14 2012 +0100
@@ -16,40 +16,40 @@
     "v1.1",
     "v1.2",
     "v1.3",
-    4,
+    "v1.4",
     "v1.5",
-    { "@value": "v1.6", "@language": "en" }
+    "v1.6"
   ],
   "term2": [
     "v2.1",
     "v2.2",
     "v2.3",
-    4,
+    "v2.4",
     "v2.5",
-    { "@value": "v2.6", "@language": "de" }
+    "v2.6"
   ],
   "term3": [
     "v3.1",
-    "v3.2",
+    32,
     "v3.3",
-    4,
-    { "@value": "v3.5", "@language": "en" },
-    { "@value": "v3.6", "@language": "en" }
+    34,
+    "v3.5",
+    "v3.6"
   ],
   "term4": [
     "v4.1",
     "v4.2",
     "v4.3",
     "v4.4",
-    { "@value": "v4.5", "@language": "de" },
-    { "@value": "v4.6", "@language": "en" }
+    "v4.5",
+    "v4.6"
   ],
   "term5": [
     "v5.1",
     "v5.2",
     "v5.3",
-    { "@value": 4 },
+    "v5.4",
     "v5.5",
-    { "@value": "v5.6" }
+    "v5.6"
   ]
 }

--- a/test-suite/tests/compact-manifest.jsonld	Sat Dec 08 16:44:09 2012 +0100
+++ b/test-suite/tests/compact-manifest.jsonld	Sat Dec 08 17:00:14 2012 +0100
@@ -140,7 +140,7 @@
     "expect": "compact-0022-out.jsonld"
   }, {
     "@type": ["test:TestCase", "jld:CompactTest"],
-    "name": "Prefixes have precedence over @vocab even if the result is longer",
+    "name": "Prefixes have precedence over @vocab - even if the result is longer",
     "input": "compact-0023-in.jsonld",
     "context": "compact-0023-context.jsonld",
     "expect": "compact-0023-out.jsonld"