Improve ETag tests