Change tests to reflect query-params spec

There are some questions in the comments too