Listener cleanup
Fix test