Tests: Simplification
Test: Added filter's tests & Filters refactored