Fix typo and cleanup in raw query tests.