Turn the agg query guard off. Add more test cases to prove it works