Reworked some stuff in the UrlClass, adapted test