Fixed unit tests for new AmazonS3Resolver