Change fixtures and factory to support new event format