Fix test cases
Add direct picky queries