fix unsubscribing function & fixtures