Add interface for mocking S3 connection
Additional tests