Update s3 test with latest payload botocore refactor

The bug in httpretty it still there, but we can just set the value
to None rather than a string.  I also filed an issue about this
on the httpretty github repo.