Fixes to etag and tests