Finish v2 of event_spec.rb