Fixing S3 mock