Updates test, support for multiple attachments