add query happy + testng