Minor unit test improvement on the ListenerHelper