Basic empty + source_events tests pass again