Corrections + test for factory
Last implementation + adjusted tests
UrlBuilder now immutable