Add listener unit tests