Fix tests and url issue