Started fixing S3 tests, it's not finished