Added settings, subscriptions and upgrade tests