cleaned up the event_manager and event_manager_spec a little bit