r9652: improve make-url, rename tests