Added deps to events to prevent premature GC of dependents
Fixed remaining tests