removed subscribed filter, added testing