Modify some test-queries to fit 1.2 syntax.