Tests adjusted to new organization of code in Subscription.