Add Test for all existing queries