SubscriptionRegistry updates and tests