Adds unsubscribe from channels; test cleanup