Some ProblematicTest fixes for QueryAdvancedTest