Renamed the listener and added some tests