Make regexp stresser test a little harder
Only use makeUrlRegExp when passing a query object
Code cleanup and handling of %aa and %AA url encoding