Added tests for querystring escaping, unit tests