Clarify query parameter code
Styleguide for tests: no named returns
Remove redundant test