Filtering testing enhanced. Basic and complex filtering corrected