simplify test queries