updated syntax for urls
more tests passing... left with some more