Added UriBuilderHelper
Made user testing less britle
Trying owned resources