Add kvtable, cbtable, fix assertJSONEqual