Feature #2815 & #3146 : adding transverse file filter
- fixing some unit tests