Add more s3 storage tests improving coverage. Monkeypatch s3 service on testing.