Final tweak to solve query tests issue.