Update doc
Fix tests for new fields added