3821 Tidy up draft and work deletion form and shorten test slightly