Attachments forms updated and tests added