Added unsubscribe api and tests