Removes unnessary listener removal and adds test
Merge #42 r=@johnnyman727: Removes unnessary listener removal and adds test