Mod to listeners to support unit testing your app

Signed-off-by: Chris Duell <me@chrisduell.com>