Failing tests and FIXME comment for conflicted attachments bug