fixed some more tests, increased timeout for queryoptimizer3 #869