Improved ETag implementation
Improve integration tests
Fixed import tests
Fix trimming on server side