Fix DataQuery - MealQuery & Add DataQueryTest - MealQueryTest