Update tests + url creation