better tests (exposed a bug)
Merge pull request #4 from StoneCypher/RemoveListeningOnStuff

better tests (exposed a bug)