Fixeds exisiting tests
Fixed update to work with attachments