Making a few more tests pass
Workaround to make makeUrl tests pass