Fixed test queries
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_1