fixed tests for new querybuilder syntax