- Restructured filters file
- All Queries::Query method are tested except those that involve filters