QueryTest cleanup

First of all: the tests are enabled again. They were all part of the problematic suite and now they are part
of the regular suite.

Also split the tests in different source files to keep them understandable.
Disabled some of the failing tests
Merge pull request #1862 from pveentjer/querytest

Querytest