use url
fix tests
use url instead of harcoding