Rolled back the S3 uploading and updated some tests.