fixed references in resolver.remove

and extra tests to make sure listener calling doesn't blow up
Merge pull request #7 from thepian/master

fixed references in resolver.remove