Fixed tests of the listener