Tests: Simplification
Test: Added filter's tests & Filters refactored
Merge branch 'tests' into dev