Added event conflict management tests
Added tests for approval of events