Added test for listener/dispatcher