Added some more queries in test case