Fixing ListenerTest