Added test data
Now correctly handling empty queries sets