--- a/test-suite/tests/expand-0004-in.jsonld	Fri Apr 06 23:05:04 2012 +0800
+++ b/test-suite/tests/expand-0004-in.jsonld	Sat Apr 07 01:07:31 2012 +0800
@@ -1,17 +1,21 @@
 {
   "@context": {
     "mylist1": {"@id": "http://example.com/mylist1", "@container": "@list"},
+    "mylist2": {"@id": "http://example.com/mylist2", "@container": "@list"},
     "myset2": {"@id": "http://example.com/myset2", "@container": "@set"},
     "myset3": {"@id": "http://example.com/myset3", "@container": "@set"}
   },
   "@id": "http://example.org/id",
-  "mylist1": {"@list": []},
-  "myset2": {"@set": []},
-  "myset3": ["v1"],
-  "http://example.org/list1": {"@list": []},
-  "http://example.org/list2": {"@list": [null]},
-  "http://example.org/set1": {"@set": []},
-  "http://example.org/set1": {"@set": [null]},
-  "http://example.org/set3": [],
-  "http://example.org/set4": [null]
-}
\ No newline at end of file
+  "mylist1": { "@list": [ ] },
+  "mylist2": "one item",
+  "myset2": { "@set": [ ] },
+  "myset3": [ "v1" ],
+  "http://example.org/list1": { "@list": [] },
+  "http://example.org/list2": { "@list": [ null ] },
+  "http://example.org/set1": { "@set": [ ] },
+  "http://example.org/set1": { "@set": [ null ] },
+  "http://example.org/set3": [ ],
+  "http://example.org/set4": [ null ],
+  "http://example.org/set5": "one item",
+  "http://example.org/property": { "@list": "one item" }
+}

--- a/test-suite/tests/expand-0004-out.jsonld	Fri Apr 06 23:05:04 2012 +0800
+++ b/test-suite/tests/expand-0004-out.jsonld	Sat Apr 07 01:07:31 2012 +0800
@@ -1,12 +1,15 @@
 [{
   "@id": "http://example.org/id",
-  "http://example.com/mylist1": [ {"@list": []} ],
-  "http://example.com/myset2": [],
-  "http://example.com/myset3": ["v1"],
-  "http://example.org/list1": [ {"@list": []} ],
-  "http://example.org/list2": [ {"@list": []} ],
-  "http://example.org/set1": [],
-  "http://example.org/set1": [],
-  "http://example.org/set3": [],
-  "http://example.org/set4": []
+  "http://example.com/mylist1": [ { "@list": [ ] } ],
+  "http://example.com/mylist2": [ { "@list": [ "one item" ] } ],
+  "http://example.com/myset2": [ ],
+  "http://example.com/myset3": [ "v1" ],
+  "http://example.org/list1": [ { "@list": [ ] } ],
+  "http://example.org/list2": [ { "@list": [ ] } ],
+  "http://example.org/set1": [ ],
+  "http://example.org/set1": [ ],
+  "http://example.org/set3": [ ],
+  "http://example.org/set4": [ ],
+  "http://example.org/set5": [ "one item" ],
+  "http://example.org/property": [ { "@list": [ "one item" ] } ]
 }]