Code

integration tests: Split simple_query into query, matching, and filter.