Fixed test queries