Filters seems to work.
Updated added "catch all" filters to existing tests.