Added in todos about url creatation.
Making the tests more readable and test what they should.