small fixes to tests for s3.
restoring global s3 config, mistakenly removed early.