Small fixes to testing draft.