Fixing tests - cannot get conflict information in HEAD request
Fixing tests
Fixing tests
Consistent naming