Removed old test event dispatcher