Relax regex for attachments. Test fixes.