Adapting tests for new ReservationEventBus/PortalEventBus structure