Improved code coverage for Listeners