Update event bus and test case
Event bus will not take different event. One bus for one special event type.