Added test
Modified listeners