Add etag checking to tests