ISPN-2957 Fix broken query test