Add tests for Subscription management

* Update test semantics