Improve tests, rework search unsubscription/deletion [MJ-473]