Fix many of S3s tests
Fix many of S3s tests

CenterForOpenScience/waterbutler,hmoco/waterbutler,icereval/waterbutler,cosenal/waterbutler,rdhyee/waterbutler,rafaeldelucena/waterbutler,TomBaxter/waterbutler,kwierman/waterbutler,Johnetordoff/waterbutler,chrisseto/waterbutler,Ghalko/waterbutler,felliott/waterbutler,RCOSDP/waterbutler