rename etag to _etag
fix tests