Fixing some tests for the new KVQuery.
Eliminating "\n" before "\r"