Renamed and commented TestEventListener