#987 Url: Update and create new tests.