Split text and multiline tests
Save date field to draft values
Save date into draft
Small cleanup of logic