Update tests to support filters right in the data collection.