More extension functions
fix bugs in UriBuilder
add UriBuilder tests