Fix specs broken due to events changes