Beef up file etag tests
Merge pull request #577 from walmartlabs/user/eran

Beef up file etag tests