ProblematicTest fixes
Merge pull request #1962 from mesutcelik/qAdvancedTests

Some ProblematicTest fixes for QueryAdvancedTest