Add some comments to test_listener, and make some trivial other edits
Merge pull request #33 from Rosuav/testlistenercomments

Add some comments to test_listener, and make some trivial other edits