Repaired QueryOptimizer tests (still failing, though)