Fix url tag and add more tests