Improved filters and test.