Fix s3 test for new file naming and content type detection semantics