Merge pull request #24 from kpartlow/master

Updated Url Class Loading on tests
Merge pull request #25 from kpartlow/master

Updated UrlClass Loading and added caching back in.
Merge pull request #26 from kpartlow/master

Added better building of urls
Added better building of urls