Refactor ETag
Improve test readability