Improved a unit test
Added unit tests for Attachment