Remove use of Event.server_name
Fix @retry decorator
Unused fixtures