Cleanup S3 a bit and add more coverage