Changed URL handling, added unit test for url handling