Start fixing errors with Unit Tests
Fixed bugs in Unit tests caused by URLHelper