Fix remove-listener to be able to remove an once event listener.
Add tests.