Fix formats/url and update tests