Updates test, support for multiple attachments
Merge pull request #857 from lukecampbell/attachments

Updates test, support for multiple attachments