Removed unused imports
Moved static "var()" methods to UriTemplateBuilder, updated tests