A lot of code calls l()/url(), let's wrap it, so we can mock it.

I think this should be calling the UrlGenerator from the container and not l() directly, which is not test coverage we need.