New specs and cleanup on the Listener