Fix 892. Update tests and change delegate listeners to listeners on the node for the specified events.