Fix how params are added to querystring
Change tests to use hard coded query strings