Fix subscribe and update subscription operations
Improve tests for the subscribe and update subscription operations