Fixed tests and listeners.