Fix failing spec
Refactor packing of event_collection event