Fixed s3 stuff?
Improving the tests