Updated tests of Query builders