Fix extra_url
Fix tests