Refactor some events into EventBridge, update tests