refactoring of `paramsForUrl`
refactor assignments to setters
small refactoring in tests
change some variable names