Fix failing tests, use explicit content-type header on s3 finalize