Use CGI.escape instead of URI.escape to escape query string params
Update specs to reflect change from URI.escape to CGI.escape

Improve strength of expectation matching by comparing to actual strings