Add filter module
Clean and update test suite