Added test for Unsubscribe
Updated some docs and misc clean up