Better filtering in tests
Revert "minor change; commit test"

This reverts commit 56f3480829920d75676cb258f1e41e6572f38485.