Add s3 teardown and setup