unsubscribe removes notifs now and tests
Merge branch 'master' into AG367