Amend changes to service_url to enable tests to pass