fix test queries