unsubscribe to channels before re-subscribing
cleanup test-related code
Merge pull request #152 from ajb/redo-pr-76

unsubscribe channels before re-subscribing