TST/CLN: clean up string query testing