Fixing trouble with spaces after url
Writing some tests