Enhance unit tests
Refactoring : simplify default filter
Reformat Code as Arnaud never did it !
Test correction