Fix tests for S3 against master-branch zendesk-attachment_fu

Just a curiousity. Used this before trying to fix tests in my aws-sdk branch of attachment_fu. for sanity checking.