Add query filter and comparator test