Fixing test query