[users] Fix event destroy test
[users] Fix sport delete test
[users] Fix conflicts after merge