Added assertion. Updated tests
Managed edge case with subscriptions. Updated tests.