Fixed Editing and Deleting Events Tests
Fixed merge conflicts