Update unit tests
Fix Attachment initialization