Adding unit tests
Refactoring Uri and QueryString