Add MultipleQueries
Add test on MultipleQueries