Rewrite of attachment point logic.  Attachmetn points are maintained independent of entities.  Update test cases.  Duplicate Mac test is disabled for the time being.