Tests updated for draft and complete