Update s3_uploader and get basic test to pass again
Update s3_uploader and get basic test to pass again