[EventBus] Improved specs