refactor the translation of the URLs + tests