Add test to event_spec and location_spec and modified models