Event: Remove Global Event Bus and some test Cleanup