Update format tests for draft 4 changes.