Test Unsubscribe

- also cleaned up some stuff I remembered after merging last commits
Merge pull request #842 from benjchristensen/range-unittest

Test Unsubscribe