Updates based on PR comments

-Handle URI's more intelligently when build remote attachment URIs
-correct URI for attachment in test case