Added tests, final Url helper adjustments