Updated some filters and tests.