Replaced url()/l()/Url::generateFromUrl() calls

Also tiny SubscribeTest corrections.