         XCTAssertNil(BookmarkType.payloadFromJSON(invalidSeparator))
 
         // This one's right.
-        let validSeparator = JSON(["type": "separator", "parentid": "toolbar", "parentName": "Bookmarks Toolbar", "pos": 3])
+        let validSeparator = JSON(["id": "abcabcabcabc", "type": "separator", "parentid": "toolbar", "parentName": "Bookmarks Toolbar", "pos": 3])
         let separator = BookmarkType.payloadFromJSON(validSeparator)!
         XCTAssertTrue(separator is SeparatorPayload)
         XCTAssertTrue(separator.isValid())


    func testBookmarks() {
        let validBookmark = JSON([
            "type": "bookmark",
            "parentid": "menu",
            "parentName": "Bookmarks Menu",

        let invalidPayload = "{\"id\": \"abcdefghijkl\", \"collection\": \"clients\", \"payload\": \"invalid\"}"
        let emptyPayload = "{\"id\": \"abcdefghijkl\", \"collection\": \"clients\", \"payload\": \"{}\"}"

        let clientBody: [String: AnyObject] = ["id": "abcdefghijkl", "name": "Foobar", "commands": [], "type": "mobile"]
        let clientBodyString = JSON(clientBody).toString(false)
        let clientRecord: [String : AnyObject] = ["id": "abcdefghijkl", "collection": "clients", "payload": clientBodyString]
        let clientPayload = JSON(clientRecord).toString(false)
