Add compatibility of ETag and ETag Unit Test