Add tombstone to Value.toStringWithStruct
Updated CLI test with all the things