Add abandon_url / fix tests