Fix test for cases where service url has user/password embedded