Listener tests cleanup