Removes unnessary listener removal and adds test