(TK-43) Address comments on PR

Change URI to be a StringBuilder to preserve as much of
old code as possible. Add additional query params test. Further,
change some variable names in tests and docs.