Tests still failing - listeners firing twice