Added UrlBuilder, more tests #1