Move delete subscription to its rightful place
Fix tests for delete_subscription
Merge pull request #208 from sigmavirus24/move-delete-subscription

Move delete subscription