Unit test for ContentId, pass build

Cleaned up code to pass all tests, added a unit test for adding
the ContentID property onto an attached file.