Remove spaces from command line queries in tool tests

On windows, golang's command line parsing library breaks parsing the --query option to the new tools if the value has a space in it. Will work on figuring out the root cause, but for now this will fix the failing tests.